Merge branch 'develop_ccs' of http://172.16.10.76/moa/amos-boot-biz into develop_ccs

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IFireTeamService.java

@@ -45,5 +45,8 @@ public interface IFireTeamService {
     List<FireTeamZhDto> getFireTeamCountList();
     
     public List<FireTeam> getFirstAidForTypeCodeAndCompanyId(String dicCode,String typeCode,Long companyId);
-    List<FireTeam> getFireTeamList(String bizOrgCode);
+
+    List<FireTeam> getFireTeamList();
+
+    List<FireTeam> getExcelFireTeamList(String bizOrgCode) ;
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FireTeamServiceImpl.java

@@ -149,12 +149,12 @@ public class FireTeamServiceImpl extends BaseService<FireTeamDto, FireTeam, Fire
     }
 
     public List<FireTeamDto> queryFireTeamForList(Boolean isDelete, Map map) {
-
-        // 权限处理
-        String bizOrgCode = map.containsKey("bizOrgCode") ? map.get("bizOrgCode").toString() : null;
         if (map == null || map.size() < 1) {
-            return fireTeamMapper.listFireTeamDto(isDelete, null, null, null, null, null,bizOrgCode);
+            return fireTeamMapper.listFireTeamDto(isDelete, null, null, null, null, null,null);
         }
+        // 权限处理
+        String bizOrgCode = map.containsKey("bizOrgCode") ? map.get("bizOrgCode").toString() : null;
+
         String nodeId = map.containsKey("nodeId") ? map.get("nodeId").toString() : null;
         String nodeType = map.containsKey("nodeType") ? map.get("nodeType").toString() : null;
         String name = map.containsKey("name") ? map.get("name").toString() : null;
@@ -466,7 +466,15 @@ public class FireTeamServiceImpl extends BaseService<FireTeamDto, FireTeam, Fire
     }
 
     @Override
-    public List<FireTeam> getFireTeamList(String bizOrgCode) {
+    public List<FireTeam> getFireTeamList() {
+
+        QueryWrapper<FireTeam> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("is_delete", false);
+        return fireTeamMapper.selectList(queryWrapper);
+    }
+
+    @Override
+    public List<FireTeam> getExcelFireTeamList(String bizOrgCode) {
 
         QueryWrapper<FireTeam> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("is_delete", false);
@@ -474,6 +482,7 @@ public class FireTeamServiceImpl extends BaseService<FireTeamDto, FireTeam, Fire
         return fireTeamMapper.selectList(queryWrapper);
     }
 
+
     public List<Menu> getFirstTeamToDesignatedDepartment() throws Exception {
         LambdaQueryWrapper<FireTeam> queryWrapper = new LambdaQueryWrapper<FireTeam>();
         queryWrapper.eq(FireTeam::getTypeCode, "116");

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/DataSourcesImpl.java

@@ -265,7 +265,7 @@ public class DataSourcesImpl implements DataSources {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         // 权限处理
         PermissionInterceptorContext.setDataAuthRule("fire_water_info");
-        List<FireTeam> records = fireTeamService.getFireTeamList(reginParams.getPersonIdentity().getBizOrgCode());
+        List<FireTeam> records = fireTeamService.getExcelFireTeamList(reginParams.getPersonIdentity().getBizOrgCode());
         List<String> names = records.stream().map(item -> {
             return item.getName() + "@" + item.getSequenceNbr();
         }).collect(Collectors.toList());
@@ -282,7 +282,7 @@ public class DataSourcesImpl implements DataSources {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         // 权限处理
         PermissionInterceptorContext.setDataAuthRule("fire_team_info");
-        List<FireTeam> records = fireTeamService.getFireTeamList(reginParams.getPersonIdentity().getBizOrgCode());
+        List<FireTeam> records = fireTeamService.getExcelFireTeamList(reginParams.getPersonIdentity().getBizOrgCode());
         List<String> names = records.stream().map(item -> {
             return item.getName() + "@" + item.getSequenceNbr();
         }).collect(Collectors.toList());
@@ -298,7 +298,7 @@ public class DataSourcesImpl implements DataSources {
         ResponseModel<ReginParams> result = equipFeignClient.getPermissions();
         ReginParams reginParams = result.getResult();
 
-        List<FireTeam> records = fireTeamService.getFireTeamList(reginParams.getPersonIdentity().getBizOrgCode());
+        List<FireTeam> records = fireTeamService.getExcelFireTeamList(reginParams.getPersonIdentity().getBizOrgCode());
         List<String> names = records.stream().map(item -> {
             return item.getName() + "@" + item.getSequenceNbr();
         }).collect(Collectors.toList());