解决冲突

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

@@ -37,7 +37,7 @@ public interface FirefightersMapper extends BaseMapper<Firefighters> {
 
     List<FirefightersDto> queryById(@Param("gw") String[] gw, @Param("name") String name);
 
-    List<Map<String, String>> selectNormalFirePerson(String jobId);
+    List<Map<String, String>> selectNormalFirePerson(String jobId,String bizOrgCode);
 
     List<Firefighters> getPersonByCodes(@Param("list") List<String> list);
 

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

@@ -217,7 +217,7 @@ public interface IOrgUsrService {
      * @param type  默认查询公司及部门，公司：COMPANY，部门：DEPARTMENT
      * @return
      */
-    List<OrgMenuDto> companyTreeByUserAndType(ReginParams reginParams, String type);
+    List<OrgMenuDto> companyTreeByUserAndType(ReginParams reginParams, String type, String station);
 
     /**
      * 获取公司部门树全量

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

@@ -255,10 +255,12 @@ SELECT
                 or LENGTH(cf.state_code) = 0
 			)
 		AND cf.is_delete = FALSE
-	<if test="jobCode != null">
-        AND find_in_set(#{jobCode},cf.job_title_code) > 0
-    </if>
-
+         <if test="jobId != null">
+             AND find_in_set(#{jobId},cf.job_title_code) > 0
+         </if>
+         <if test='bizOrgCode!=null and bizOrgCode!=""'>
+             and cf.biz_org_code like concat  (#{bizOrgCode},'%')
+         </if>
 	) cff
 LEFT JOIN cb_fire_team cft ON cff.fire_team_id = cft.sequence_nbr
 

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

@@ -956,6 +956,9 @@ LEFT JOIN (
                     AND ( usr.biz_org_type = 'COMPANY' OR usr.biz_org_type = 'DEPARTMENT')
                 </otherwise>
             </choose>
+            <if test="bizOrgCode != null and bizOrgCode != ''">
+                AND usr.biz_org_code LIKE CONCAT(#{bizOrgCode}, '%')
+            </if>
             order by usr.rec_date
         </where>
     </select>

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FireStationController.java

@@ -189,7 +189,7 @@ public class FireStationController extends BaseController {
         ReginParams reginParams = getSelectedOrgInfo();
         // 权限赋值
         PermissionInterceptorContext.setDataAuthRule(authKey);
-        return ResponseHelper.buildResponse(iOrgUsrService.companyTreeByUserAndType(reginParams, OrgPersonEnum.公司.getKey()));
+        return ResponseHelper.buildResponse(iOrgUsrService.companyTreeByUserAndType(reginParams, OrgPersonEnum.公司.getKey(),null));
     }
     @PersonIdentify
 	@TycloudOperation(ApiLevel = UserType.AGENCY)

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FireTeamController.java

@@ -363,12 +363,12 @@ public class FireTeamController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/companyTreeByUserAndType", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据登录人及类型获取公司树", notes = "根据登录人及类型获取公司树")
-    public ResponseModel<List<OrgMenuDto>> companyTreeByUserAndType() {
+    public ResponseModel<List<OrgMenuDto>> companyTreeByUserAndType(@RequestParam(required = false, value = "station")String station) {
         // 获取登陆人角色
         ReginParams reginParams = getSelectedOrgInfo();
         // 权限赋值
         PermissionInterceptorContext.setDataAuthRule(authKey);
-        List<OrgMenuDto> menus = iOrgUsrService.companyTreeByUserAndType(reginParams, OrgPersonEnum.公司.getKey());
+        List<OrgMenuDto> menus = iOrgUsrService.companyTreeByUserAndType(reginParams, OrgPersonEnum.公司.getKey(),station);
         return ResponseHelper.buildResponse(menus);
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/KeySiteController.java

@@ -299,10 +299,10 @@ public class KeySiteController extends BaseController {
 		// 权限赋值
 		PermissionInterceptorContext.setDataAuthRule(authKey);
 		if ("all".equals(type)) {
-			List<OrgMenuDto> menus = iOrgUsrService.companyTreeByUserAndType(reginParams, null);
+			List<OrgMenuDto> menus = iOrgUsrService.companyTreeByUserAndType(reginParams, null, null);
 			return ResponseHelper.buildResponse(menus);
 		} else {
-			List<OrgMenuDto> menus = iOrgUsrService.companyTreeByUserAndType(reginParams, OrgPersonEnum.公司.getKey());
+			List<OrgMenuDto> menus = iOrgUsrService.companyTreeByUserAndType(reginParams, OrgPersonEnum.公司.getKey(), null);
 			return ResponseHelper.buildResponse(menus);
 		}
 	}

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java

@@ -937,7 +937,7 @@ public class OrgUsrController extends BaseController {
 		}
 		// 权限处理
 		PermissionInterceptorContext.setDataAuthRule(authKey);
-		List<OrgMenuDto> menus = iOrgUsrService.companyTreeByUserAndType(reginParams, orgType);
+		List<OrgMenuDto> menus = iOrgUsrService.companyTreeByUserAndType(reginParams, orgType, null);
 		return ResponseHelper.buildResponse(menus);
 	}
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/WaterResourceController.java

@@ -611,7 +611,7 @@ public class WaterResourceController extends BaseController {
         ReginParams reginParams = getSelectedOrgInfo();
         // 权限赋值
         PermissionInterceptorContext.setDataAuthRule(authKey);
-        List<OrgMenuDto> menus = iOrgUsrService.companyTreeByUserAndType(reginParams, null);
+        List<OrgMenuDto> menus = iOrgUsrService.companyTreeByUserAndType(reginParams, null, null);
         return ResponseHelper.buildResponse(menus);
     }
 

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

@@ -220,8 +220,8 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
 		return	this.baseMapper.selectMaps(wrapper);
 	}
 
-	public Object getAllFirefightersPerson(String jobId) {
-		return firefightersMapper.selectNormalFirePerson(jobId);
+	public Object getAllFirefightersPerson(String jobId,String bizOrgCode) {
+		return firefightersMapper.selectNormalFirePerson(jobId,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/OrgUsrServiceImpl.java

@@ -1885,17 +1885,39 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		return gettTreeByUser(user, companyDepartmentMsgList);
 	}
 
-	@Override
-	public List<OrgMenuDto> companyTreeByUserAndType(ReginParams reginParams, String type) {
+	public List<OrgMenuDto> companyTreeByUserAndType(ReginParams reginParams, String type, String station) {
 		Map<String, Object> param = new HashMap<>();
 		String bizOrgCode = reginParams.getPersonIdentity().getBizOrgCode();
-
+		if ("dl".equals(station)){
+			LambdaQueryWrapper<OrgUsr> lambda = new QueryWrapper<OrgUsr>().lambda();
+			lambda.eq(OrgUsr::getBizOrgCode, bizOrgCode);
+			lambda.eq(OrgUsr::getIsDelete, false);
+			OrgUsr orgUsr = orgUsrMapper.selectList(lambda).get(0);
+			if (!org.apache.commons.lang3.ObjectUtils.isEmpty(orgUsr.getBizOrgType()) && "COMPANY".equals(orgUsr.getBizOrgType())) {
+				bizOrgCode = orgUsr.getBizOrgCode();
+			} else {
+				bizOrgCode = getCompanyNameById(orgUsr.getParentId());
+			}
+		}
 		param.put("bizOrgCode", bizOrgCode);
 		param.put("type", type);
 		List<OrgUsr> list = orgUsrMapper.companyTreeByUserAndType(param);
 		return buildTreeParallel(list);
 	}
 
+	private String getCompanyNameById(String id) {
+		LambdaQueryWrapper<OrgUsr> lambda = new QueryWrapper<OrgUsr>().lambda();
+		lambda.eq(OrgUsr::getSequenceNbr, id);
+		lambda.eq(OrgUsr::getIsDelete, false);
+		OrgUsr orgUsr = orgUsrMapper.selectList(lambda).get(0);
+		if (!org.apache.commons.lang3.ObjectUtils.isEmpty(orgUsr.getBizOrgType()) && "COMPANY".equals(orgUsr.getBizOrgType())) {
+			return orgUsr.getBizOrgCode();
+		} else {
+			return getCompanyNameById(orgUsr.getParentId());
+		}
+
+	}
+
 	@Override
 	public List<OrgMenuDto> companyTreeAll(String type) {
 		Map<String, Object> param = new HashMap<>();

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersController.java

@@ -113,6 +113,8 @@ public class FirefightersController extends BaseController {
 
     @Value("${auth-key-fire-fighters:fire_fighters_info}")
     private String authKey;
+    @Value("${system.type}")
+    private String type;
     @Autowired
     IUserCarService userCarService;
 
@@ -198,7 +200,7 @@ public class FirefightersController extends BaseController {
         ReginParams reginParams = getSelectedOrgInfo();
         // 权限赋值
         PermissionInterceptorContext.setDataAuthRule(authKey);
-        List<OrgMenuDto> menus = iOrgUsrService.companyTreeByUserAndType(reginParams, OrgPersonEnum.公司.getKey());
+        List<OrgMenuDto> menus = iOrgUsrService.companyTreeByUserAndType(reginParams, OrgPersonEnum.公司.getKey(), null);
         return ResponseHelper.buildResponse(menus);
     }
 
@@ -420,11 +422,18 @@ public class FirefightersController extends BaseController {
      * @return
      * @throws Exception
      */
+    @PersonIdentify
     @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/all/fire/person", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "所有的消防人员", notes = "所有的消防人员")
     public ResponseModel<Object> getAllFirefightersPerson(String jobCode)throws Exception {
-        return ResponseHelper.buildResponse(iFirefightersService.getAllFirefightersPerson(jobCode));
+        String bizOrgCode = null;
+        if("dl".equals(type)){
+            // 获取登陆人角色firefighters/all/fire/person
+            ReginParams reginParams = getSelectedOrgInfo();
+            bizOrgCode = reginParams.getPersonIdentity().getBizOrgCode();
+        }
+        return ResponseHelper.buildResponse(iFirefightersService.getAllFirefightersPerson(jobCode,bizOrgCode));
     }
 
     /**

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

@@ -318,7 +318,7 @@ public class DataSourcesImpl implements DataSources {
         // 权限处理
         PermissionInterceptorContext.setDataAuthRule("fire_station_info");
 
-        List<OrgMenuDto> orgUsrTree = iOrgUsrService.companyTreeByUserAndType(reginParams, OrgPersonEnum.公司.getKey());
+        List<OrgMenuDto> orgUsrTree = iOrgUsrService.companyTreeByUserAndType(reginParams, OrgPersonEnum.公司.getKey(), null);
         //List<OrgMenuDto> orgUsrTree = orgUsrService.getTree(null, orgUsrService.selectCompanyDepartmentMsg(),
           //      OrgUsr.class.getName(), "getSequenceNbr", 2, "getBizOrgName", "getParentId", "getBizOrgType");
         List<String> stringList = new ArrayList<String>();
@@ -368,7 +368,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<OrgMenuDto> orgUsrTree = iOrgUsrService.companyTreeByUserAndType(reginParams, OrgPersonEnum.公司.getKey());
+        List<OrgMenuDto> orgUsrTree = iOrgUsrService.companyTreeByUserAndType(reginParams, OrgPersonEnum.公司.getKey(), null);
         //       List<OrgMenuDto> orgUsrTree = orgUsrService.getTree(null, orgUsrService.selectCompanyDepartmentMsg(),
         //  OrgUsr.class.getName(), "getSequenceNbr", 2, "getBizOrgName", "getParentId", "getBizOrgType");
         List<String> stringList = new ArrayList<String>();
@@ -476,7 +476,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<OrgMenuDto> orgUsrTree = iOrgUsrService.companyTreeByUserAndType(reginParams, OrgPersonEnum.公司.getKey());
+        List<OrgMenuDto> orgUsrTree = iOrgUsrService.companyTreeByUserAndType(reginParams, OrgPersonEnum.公司.getKey(), null);
 
 //        List<OrgMenuDto> orgUsrTree = orgUsrService.getTree(null, orgUsrService.getCompanyDetailTree(),
 //                OrgUsr.class.getName(), "getSequenceNbr", 2, "getBizOrgName", "getParentId", "getBizOrgType");
@@ -493,7 +493,7 @@ public class DataSourcesImpl implements DataSources {
         // 权限处理
         PermissionInterceptorContext.setDataAuthRule("key_site_info");
         // 修改bug6829 查询单位和部门数据
-        List<OrgMenuDto> orgUsrTree = iOrgUsrService.companyTreeByUserAndType(reginParams, null);
+        List<OrgMenuDto> orgUsrTree = iOrgUsrService.companyTreeByUserAndType(reginParams, null, null);
 
 //        List<OrgMenuDto> orgUsrTree = orgUsrService.getTree(null, orgUsrService.getCompanyDetailTree(),
 //                OrgUsr.class.getName(), "getSequenceNbr", 2, "getBizOrgName", "getParentId", "getBizOrgType");

amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml

@@ -2920,7 +2920,7 @@
         </if>
 
         <if test="dto.bizOrgCode!=null and dto.bizOrgCode!=''">
-            and wesp.biz_org_code like concat(#{bizOrgCode}, '%')
+            and wesp.biz_org_code like concat(#{dto.bizOrgCode}, '%')
         </if>
      </where>
     </select>

amos-boot-system-jcs/src/main/resources/application.properties

@@ -136,4 +136,6 @@ mqtt.topic.command.car.jw=carCoordinates
 
 management.security.enabled=true
 spring.security.user.name=admin
-spring.security.user.password=a1234560
\ No newline at end of file
+spring.security.user.password=a1234560
+#?????????
+system.type=dl
\ No newline at end of file