修改机顶盒运维信息管理查询总数不对

src/main/java/cn/chnmuseum/party/service/impl/AuditServiceImpl.java

@@ -365,9 +365,9 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
                 update = this.exhibitionBoardService.updateById(exhibitionBoard);
                 break;
             case REMOVE:
-//                6.2改 getExhibitionBoardCatId改为getExhibitionBoardId
-//                final LambdaQueryWrapper<LearningContentBoard> learningContentBoardLambdaQueryWrapper = Wrappers.<LearningContentBoard>lambdaQuery().eq(LearningContentBoard::getExhibitionBoardCatId, exhibitionBoardId);
-                final LambdaQueryWrapper<LearningContentBoard> learningContentBoardLambdaQueryWrapper = Wrappers.<LearningContentBoard>lambdaQuery().eq(LearningContentBoard::getExhibitionBoardId, exhibitionBoardId);
+//              6.2改 getExhibitionBoardCatId改为getExhibitionBoardId
+//              final LambdaQueryWrapper<LearningContentBoard> learningContentBoardLambdaQueryWrapper = Wrappers.<LearningContentBoard>lambdaQuery().eq(LearningContentBoard::getExhibitionBoardCatId, exhibitionBoardId);
+                final LambdaQueryWrapper<LearningContentBoard> learningContentBoardLambdaQueryWrapper = Wrappers.<LearningContentBoard>lambdaQuery().eq(LearningContentBoard::getExhibitionBoardCatId, exhibitionBoardId);
                 final List<LearningContentBoard> learningContentBoardList = this.learningContentBoardService.list(learningContentBoardLambdaQueryWrapper);
                 if (learningContentBoardList != null && !learningContentBoardList.isEmpty()) {
                     final Map<String, List<String>> collect = learningContentBoardList.stream().collect(Collectors.groupingBy(LearningContentBoard::getLearningContentId, Collectors.mapping(LearningContentBoard::getExhibitionBoardId, Collectors.toList())));

src/main/java/cn/chnmuseum/party/web/controller/LoginController.java

@@ -230,6 +230,8 @@ public class LoginController extends BaseController {
                     Long i = user.getExiredDate().toEpochDay() - LocalDate.now().toEpochDay();
                     resultMap.put("expireNum", i);
                 }
+                user.setPassword("");
+                user.setPhone("");
                 resultMap.put("user", user);
                 resultMap.put("token", token);
                 resultMap.put("menuList", userMenuPerms);

src/main/resources/mapper/TBoxOperationMapper.xml

@@ -76,9 +76,9 @@
 
     <select id="selectPageList" resultMap="BaseResultMap">
         SELECT b.id,b.organ_id,b.mac,b.status,b.area_id,b.create_time,b.update_time,r.name organ_name ,u.user_name
-        FROM t_box_operation b
+        FROM (t_box_operation b
         left join t_organ r on r.id = b.organ_id
-        left join t_user u on u.org_id = b.organ_id and u.type = '2'
+        left join t_user u on u.org_id = b.organ_id and u.type = '2')
         where 1=1
         <if test="tBoxOperation.organId != null and tBoxOperation.organId != '' ">
             and b.organ_id =#{tBoxOperation.organId}