更加账号获取snCode,分角色

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

@@ -177,7 +177,9 @@ public class CameraDetailServiceImpl extends MPJBaseServiceImpl<ICameraDetailMap
     @Override
     public List<CameraDetail> getByCompanyAndType(Long companyId, Integer type) {
         LambdaQueryWrapper<CameraDetail> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(CameraDetail::getCompanyId,companyId);
+        if(companyId != null){
+            wrapper.eq(CameraDetail::getCompanyId,companyId);
+        }
         wrapper.eq(CameraDetail::getType,type);
         return this.list(wrapper);
     }

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

@@ -1,8 +1,5 @@
 package com.fdkankan.manage_jp.service.impl;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -215,11 +212,20 @@ public class CameraServiceImpl extends MPJBaseServiceImpl<ICameraMapper, Camera>
             throw new BusinessException(ResultCode.USER_NOT_EXIST);
         }
         Integer cameraType = CameraTypeUtils.getCameraType(param.getType());
-        List<CameraDetail> cameraDetails = cameraDetailService.getByCompanyAndType(user.getCompanyId(),cameraType);
+        Set<Long> roleIds = userRoleService.getByUser(user);
+        List<CameraDetail> cameraDetails = new ArrayList<>();
+        if(roleIds.contains(5L)){
+            cameraDetails =  cameraDetailService.getByCompanyAndType(null,cameraType);
+        }else if(roleIds.contains(6L)){
+            cameraDetails =  cameraDetailService.getByCompanyAndType(user.getCompanyId(),cameraType);
+        }else {
+            cameraDetails = cameraDetailService.getByUserIdAndType(user.getId(),cameraType);
+        }
+
         if(cameraDetails.isEmpty()){
             return null;
         }
         List<Long> cameraIds = cameraDetails.stream().map(CameraDetail::getCameraId).collect(Collectors.toList());
         return this.listByIds(cameraIds);
     }
-}
+}