1

src/main/java/com/fdkankan/ucenter/mapper/ICameraDetailMapper.java

@@ -19,6 +19,6 @@ import java.util.List;
 @Mapper
 public interface ICameraDetailMapper extends BaseMapper<CameraDetail> {
 
-    List<CameraAppVo> getListByUserAndType(@Param("companyId") Long companyId, @Param("cameraType") Integer cameraType);
+    List<CameraAppVo> getListByUserAndType(@Param("userId") Long userId,@Param("companyId") Long companyId, @Param("cameraType") Integer cameraType);
     List<CameraAppVo> getListByUserIdsAndType(@Param("userIds") List<Long> userId, @Param("cameraType") Integer cameraType);
 }

src/main/java/com/fdkankan/ucenter/service/ICameraDetailService.java

@@ -33,7 +33,7 @@ public interface ICameraDetailService extends IService<CameraDetail> {
 
     void addUsedSpace(HashMap<Long, Long> cameraMap);
 
-    List<CameraAppVo> getListByUserAndType(Long userId, Integer cameraType);
+    List<CameraAppVo> getListByUserAndType(Long userId,Long companyId, Integer cameraType);
 
     List<CameraAppVo> getListByUserIdsAndType(List<Long> userId, Integer cameraType);
 

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

@@ -52,7 +52,14 @@ public class AppCameraService {
         if(user == null){
             throw new BusinessException(LoginConstant.FAILURE_CODE_3015, LoginConstant.FAILURE_MSG_3015);
         }
-        List<CameraAppVo> cameraAppVoList = cameraDetailService.getListByUserAndType(user.getCompanyId(), cameraType);
+        List<CameraAppVo> cameraAppVoList = new ArrayList<>();
+
+        Set<Long> roleIds = userRoleService.getByUser(user);
+        if(!roleIds.contains(5L) && !roleIds.contains(6L) && !roleIds.contains(1L)){
+            cameraAppVoList = cameraDetailService.getListByUserAndType(user.getId(),user.getCompanyId(), cameraType);
+        }else {
+            cameraAppVoList = cameraDetailService.getListByUserAndType(null,user.getCompanyId(), cameraType);
+        }
         for (CameraAppVo cameraApp : cameraAppVoList) {
             UserIncrement userIncrementEntity = userIncrementService.getByCameraId(cameraApp.getId());
             if(userIncrementEntity != null){

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

@@ -157,8 +157,8 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
     }
 
     @Override
-    public List<CameraAppVo> getListByUserAndType(Long companyId, Integer cameraType) {
-        return this.getBaseMapper().getListByUserAndType(companyId,cameraType);
+    public List<CameraAppVo> getListByUserAndType(Long userId,Long companyId, Integer cameraType) {
+        return this.getBaseMapper().getListByUserAndType(userId,companyId,cameraType);
     }
     @Override
     public List<CameraAppVo> getListByUserIdsAndType(List<Long> userId, Integer cameraType) {

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

@@ -9,6 +9,9 @@
         WHERE d.rec_status = 'A'
         and d.company_id = #{companyId}
         and d.goods_id = #{cameraType}
+        <if test="userId !=null">
+            and d.user_id = #{userId}
+        </if>
     </select>
 
     <select id="getListByUserIdsAndType" resultType="com.fdkankan.ucenter.vo.response.CameraAppVo">