修改导入导出权限bug

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/WaterResourceDto.java

@@ -72,7 +72,7 @@ public class WaterResourceDto extends BaseDto {
 	@ApiModelProperty(value = "管理单位id")
 	private Long managementUnitId;
 
-	@ExplicitConstraint(indexNum = 9, sourceClass = CommonExplicitConstraint.class, method = "getCompanyList")
+	@ExplicitConstraint(indexNum = 9, sourceClass = CommonExplicitConstraint.class, method = "getWaterCompanyList")
 	@ExcelProperty(value = "管理单位", index = 9)
 	@ApiModelProperty(value = "管理单位")
 	private String managementUnit;

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FirefightersMapper.java

@@ -35,7 +35,7 @@ public interface FirefightersMapper extends BaseMapper<Firefighters> {
     List<Map<String,String>> getFirefightersName( );
 
 	List<FirefightersExcelDto> exportToExcel(Boolean isDelete, String name, String postQualification, String fireTeamId,
-			String state, String areasExpertise, String jobTitle);
+			String state, String areasExpertise, String jobTitle,String bizOrgCode);
 
 	List<FirefightersDto> queryById(@Param("gw")String[] gw, @Param("name")String name);
 	

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/WaterResourceMapper.java

@@ -21,7 +21,7 @@ import java.util.Map;
  */
 public interface WaterResourceMapper extends BaseMapper<WaterResource> {
 
-    List<WaterResourceDto> exportToExcel(@Param("isDelete")Boolean isDelete,@Param("name")String name, @Param("resourceType")String resourceType);
+    List<WaterResourceDto> exportToExcel(@Param("isDelete")Boolean isDelete,@Param("name")String name, @Param("resourceType")String resourceType, @Param("bizOrgCode")String bizOrgCode);
 
 
     /***

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FirefightersMapper.xml

@@ -32,7 +32,6 @@
         <if test='par.areasExpertiseCode!=null and par.areasExpertiseCode!="0"'>and b.areas_expertise_code
             =#{par.areasExpertiseCode}
         </if>
-
         <if test='par.company!=null and par.company!= -1'>and a.company= #{par.company}</if>
 
 
@@ -169,6 +168,7 @@
         <if test='state !=null'>and f.state_code = #{state}</if>
         <if test='areasExpertise!=null'>and fp.areas_expertise_code = #{areasExpertise}</if>
         <if test='jobTitle!=null'>and f.job_title_code = #{jobTitle}</if>
+        <if test='bizOrgCode!=null'>and f.biz_org_code  like concat ('%',#{bizOrgCode},'%')  </if>
     </select>
 
     <select id="getFirefightersName" resultType="Map">

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/WaterResourceMapper.xml

@@ -71,6 +71,9 @@
         <if test='resourceType!=null and resourceType!=""'>
             and r.resource_type= #{resourceType}
         </if>
+        <if test='bizOrgCode !=null and bizOrgCode!=""'>
+            and r.biz_org_code like concat('%',#{bizOrgCode}, '%')
+        </if>
     </select>
 
 

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

@@ -55,7 +55,7 @@ public class FireStationServiceImpl extends BaseService<FireStationDto, FireStat
     /**
      * 列表查询 示例
      */
-    public List<FireStationDto> queryForFireStationList(@Condition(Operator.eq) Boolean isDelete,@Condition(Operator.eq) Long bizCompanyId,@Condition(Operator.like) String name,@Condition(Operator.eq) String bizOrgCode) {
+    public List<FireStationDto> queryForFireStationList(@Condition(Operator.eq) Boolean isDelete,@Condition(Operator.eq) Long bizCompanyId,@Condition(Operator.like) String name,@Condition(Operator.like) String bizOrgCode) {
         return this.queryForList("", false, isDelete,bizCompanyId,name,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/FirefightersServiceImpl.java

@@ -102,7 +102,7 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
 	 */
 	public List<FirefightersExcelDto> exportToExcel(@Condition(Operator.eq) Boolean isDelete, Map par) {
 		if (par == null || par.size() < 1) {
-			return firefightersMapper.exportToExcel(isDelete, null, null, null, null, null, null);
+			return firefightersMapper.exportToExcel(isDelete, null, null, null, null, null, null,null);
 		}
 		String name = par.containsKey("name") ? par.get("name").toString() : null;
 		String postQualification = par.containsKey("postQualification") ? par.get("postQualification").toString()
@@ -111,8 +111,9 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
 		String state = par.containsKey("state") ? par.get("state").toString() : null;
 		String areasExpertise = par.containsKey("areasExpertise") ? par.get("areasExpertise").toString() : null;
 		String jobTitle = par.containsKey("jobTitle") ? par.get("jobTitle").toString() : null;
+		String bizOrgCode = par.containsKey("bizOrgCode") ?  par.get("bizOrgCode").toString() : null;
 		return firefightersMapper.exportToExcel(isDelete, name, postQualification, fireTeamId, state, areasExpertise,
-				jobTitle);
+				jobTitle,bizOrgCode);
 	}
 
 	@Override

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

@@ -190,8 +190,8 @@ public class WaterResourceServiceImpl extends BaseService<WaterResourceDto, Wate
      * 导出列表
      */
     public List<WaterResourceDto> exportToExcel(Boolean isDelete, String name,
-                                                String resourceType) {
-        return waterResourceMapper.exportToExcel(isDelete, name, resourceType);
+                                                String resourceType,String bizOrgCode ) {
+        return waterResourceMapper.exportToExcel(isDelete, name, resourceType,bizOrgCode);
     }
 
     @Override

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

@@ -220,8 +220,14 @@ public class DataSourcesImpl implements DataSources {
     }
 
     private String[] getFirefighters() {
+        // 导出模板增加权限
+        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+        // 权限处理
+        PermissionInterceptorContext.setDataAuthRule("fire_fighters_info");
+        FirefightersDto firefightersDto = new FirefightersDto();
+        firefightersDto.setBizOrgCode(reginParams.getPersonIdentity().getBizOrgCode());
         List<FirefightersZhDto> firefighters = firefightersService.getFirefighters(1, Integer.MAX_VALUE,
-                new FirefightersDto());
+                firefightersDto );
         List<String> names = firefighters.stream().map(item -> {
             return item.getName() + "@" + item.getSequenceNbr();
         }).collect(Collectors.toList());
@@ -230,8 +236,27 @@ public class DataSourcesImpl implements DataSources {
     }
 
     private String[] getCompanyList() throws Exception {
-        List<OrgMenuDto> orgUsrTree = orgUsrService.getTree(null, orgUsrService.selectCompanyDepartmentMsg(),
-                OrgUsr.class.getName(), "getSequenceNbr", 2, "getBizOrgName", "getParentId", "getBizOrgType");
+        // 导出模板增加权限
+        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+        // 权限处理
+        PermissionInterceptorContext.setDataAuthRule("fire_fighters_info");
+        List<OrgMenuDto> orgUsrTree = iOrgUsrService.companyTreeByUserAndType(reginParams, OrgPersonEnum.公司.getKey());
+ //       List<OrgMenuDto> orgUsrTree = orgUsrService.getTree(null, orgUsrService.selectCompanyDepartmentMsg(),
+              //  OrgUsr.class.getName(), "getSequenceNbr", 2, "getBizOrgName", "getParentId", "getBizOrgType");
+        List<String> stringList = new ArrayList<String>();
+        initCompanyList(orgUsrTree, stringList);
+        String[] str = stringList.toArray(new String[stringList.size()]);
+        return str;
+    }
+
+    private String[] getWaterCompanyList() throws Exception {
+        // 导出模板增加权限
+        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+        // 权限处理
+        PermissionInterceptorContext.setDataAuthRule("fire_water_info");
+        List<OrgMenuDto> orgUsrTree = iOrgUsrService.companyTreeByUserAndType(reginParams, OrgPersonEnum.公司.getKey());
+        //       List<OrgMenuDto> orgUsrTree = orgUsrService.getTree(null, orgUsrService.selectCompanyDepartmentMsg(),
+        //  OrgUsr.class.getName(), "getSequenceNbr", 2, "getBizOrgName", "getParentId", "getBizOrgType");
         List<String> stringList = new ArrayList<String>();
         initCompanyList(orgUsrTree, stringList);
         String[] str = stringList.toArray(new String[stringList.size()]);

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

@@ -251,9 +251,9 @@ public class ExcelServiceImpl {
 			List<WaterResourceDto> waterResourceDtoList = null;
 			if(par.size()>0) {
 				waterResourceDtoList = waterResourceServiceImpl.exportToExcel(true,par.containsKey("name")?par.get("name").toString():null,
-						par.containsKey("resourceType")?par.get("resourceType").toString():null);
+						par.containsKey("resourceType")?par.get("resourceType").toString():null,par.containsKey("bizOrgCode")?par.get("bizOrgCode").toString():null);
 			}else{
-				waterResourceDtoList = waterResourceServiceImpl.exportToExcel(true,null,null);
+				waterResourceDtoList = waterResourceServiceImpl.exportToExcel(true,null,null,par.containsKey("bizOrgCode")?par.get("bizOrgCode").toString():null);
 			}
 			ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), waterResourceDtoList,
 					WaterResourceDto.class, dataSourcesImpl, false);
@@ -279,7 +279,7 @@ public class ExcelServiceImpl {
             Long bizCompanyId =null; 
 			if(par!=null && par.size()>0) {
 				nameString =par.containsKey("name")?par.get("name").toString():null;
-				bizCompanyId =par.containsKey("bizCompanyId")?Long.parseLong(par.get("bizCompanyId").toString()):null;;
+				bizCompanyId =par.containsKey("bizCompanyId")?Long.parseLong(par.get("bizCompanyId").toString()):null;
 			}
 			List<FireStationDto> fireStationDtoList = fireStationService.queryForFireStationList(false, bizCompanyId,nameString,par.containsKey("bizOrgCode")?par.get("bizOrgCode").toString():null);
 			ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), fireStationDtoList,