修改bug

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,5 @@ public interface IFireTeamService {
     List<FireTeamZhDto> getFireTeamCountList();
     
     public List<FireTeam> getFirstAidForTypeCodeAndCompanyId(String dicCode,String typeCode,Long companyId);
-    List<FireTeam> getFireTeamList();
+    List<FireTeam> getFireTeamList(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

@@ -450,10 +450,11 @@ public class FireTeamServiceImpl extends BaseService<FireTeamDto, FireTeam, Fire
     }
 
     @Override
-    public List<FireTeam> getFireTeamList() {
+    public List<FireTeam> getFireTeamList(String bizOrgCode) {
 
         QueryWrapper<FireTeam> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("is_delete", false);
+        queryWrapper.like("biz_org_code",bizOrgCode);
         return fireTeamMapper.selectList(queryWrapper);
     }
 

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

@@ -183,10 +183,11 @@ public class DataSourcesImpl implements DataSources {
 //		IPage<FireTeamCardDto> fireTeamCardDtoIPage = fireTeamService.listFireTeamByPage(pageBean,
 //				new FireTeamListDto());
 //		List<FireTeamCardDto> records = fireTeamCardDtoIPage.getRecords();
-
-        List<FireTeam> records = fireTeamService.getFireTeamList();
-
-
+        // 导出模板增加权限
+        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<String> names = records.stream().map(item -> {
             return item.getName() + "@" + item.getSequenceNbr();
         }).collect(Collectors.toList());
@@ -404,7 +405,11 @@ public class DataSourcesImpl implements DataSources {
     private String[] getCompany() {
 
         //List<OrgMenuDto> menus = OrgUsrServiceImpl.buildTreeParallel(iOrgUsrService.selectCompanyDepartmentMsg());
-        List<OrgUsr> menus = iOrgUsrService.selectCompanyDepartmentMsg();
+        // 导出模板增加权限
+        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+        // 权限处理
+        PermissionInterceptorContext.setDataAuthRule("fire_fighters_info");
+        List<OrgUsr> menus = iOrgUsrService.companyTreeByUserAndTypeNoTree(reginParams, null);
         List<String> names = menus.stream().map(item -> {
             return item.getBizOrgName() + "@" + item.getSequenceNbr() + "@" + item.getBizOrgCode();
         }).collect(Collectors.toList());
@@ -412,6 +417,8 @@ public class DataSourcesImpl implements DataSources {
         return str;
     }
 
+
+
     /**
      * 消防队员模板获取地址
      *