1

src/main/java/com/fdkankan/ucenter/service/impl/CameraServiceImpl.java

@@ -170,12 +170,12 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
             }
         }
 
-       // User user = userService.getByUserName(param.getUserName());
+        User user = userService.getByUserName(param.getUserName());
         Long userId = null;
-//        Set<Long> roleIds = userRoleService.getByUser(user);
-//        if(!roleIds.contains(6L) &&  !roleIds.contains(5L)){
-//            userId = user.getId();
-//        }
+        Set<Long> roleIds = userRoleService.getByUser(user);
+        if(!roleIds.contains(6L) &&  !roleIds.contains(5L)){
+            userId = user.getId();
+        }
         Page<CameraVo> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
         List<Long> cameraIdList = page.getRecords().parallelStream().map(CameraVo::getId).collect(Collectors.toList());
         HashMap<Long,GroupByCount> sceneNumMap = new HashMap<>();      //场景数量,最后拍摄时间

src/main/resources/mapper/ucenter/CameraMapper.xml

@@ -4,11 +4,10 @@
 
     <select id="pageList" resultType="com.fdkankan.ucenter.vo.response.CameraVo">
         select c.id,c.sn_code,c.child_name ,d.balance,d.type , d.total_space,d.used_space,
-        u.id as cooperationUser,u.user_name as cooperationUserName,g.pic,d.goods_id
+        u.id as cooperationUser,u.user_name as cooperationUserName,d.goods_id
         from t_camera c
         left join t_camera_detail d on c.id = d.camera_id
         left join t_user u on d.cooperation_user = u.id
-        left join t_goods g on d.goods_id = g.id
         WHERE c.rec_status = 'A'
         <if test="param.selecttype !=null and param.selecttype == 2 and param.childName !=null and param.childName!='' ">
             and c.child_name like CONCAT('%',#{param.childName},'%')