修改bug

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

@@ -122,4 +122,6 @@ public interface OrgUsrMapper extends BaseMapper<OrgUsr> {
     String getParentList(@Param("id") String id);
 
     List<OrgUsr> selectPersonListByCompanyIdList(@Param("companyIdList") List<String> companyIdList);
+
+    Map<String,String> getManagePerson(@Param("name")String name ,@Param("ids")List<Long> ids);
 }

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

@@ -884,5 +884,25 @@ LEFT JOIN (
         </foreach>);
     </select>
 
-
+    <select id="getManagePerson" resultType="Map">
+        SELECT
+        group_concat(
+            DISTINCT
+            CONCAT(
+                u.biz_org_name,
+                ' ',
+                IFNULL(( SELECT c.field_value FROM cb_dynamic_form_instance c WHERE field_code = 'telephone' AND c.instance_id = u.sequence_nbr ), "" )
+            )) uname
+        FROM
+            cb_org_usr u
+            LEFT JOIN cb_dynamic_form_instance g ON g.instance_id = u.sequence_nbr
+            LEFT JOIN cb_firefighters_post p ON p.org_usr_id = u.sequence_nbr
+        WHERE
+            u.biz_org_type = 'PERSON'
+            AND p.fire_management_post like CONCAT('%',#{name},'%')
+            AND u.sequence_nbr in
+            <foreach collection="ids" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>;
+    </select>
 </mapper>

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

@@ -1156,12 +1156,22 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		OrgUsrFormDto orgUsrFormVo = new OrgUsrFormDto();
 		orgUsrFormVo.setDynamicFormAlert(formValue);
 		BeanUtils.copyProperties(orgUsr, orgUsrFormVo);
-		Map<String, String> Xfaq = orgUsrMapper.selectPersonone("消防安全负责人", id);
-		Map<String, String> Xfgl = orgUsrMapper.selectPersonone("消防安全管理人", id);
-		Map<String, String> Dwfz = orgUsrMapper.selectPersonone("法定代表人", id);
-		orgUsrFormVo.setXfaq(Xfaq != null ? Xfaq.get("name") : "");
-		orgUsrFormVo.setXfgl(Xfgl != null ? Xfgl.get("name") : "");
-		orgUsrFormVo.setDwfz(Dwfz != null ? Dwfz.get("name") : "");
+//		Map<String, String> Xfaq = orgUsrMapper.selectPersonone("消防安全负责人", id);
+//		Map<String, String> Xfgl = orgUsrMapper.selectPersonone("消防安全管理人", id);
+//		Map<String, String> Dwfz = orgUsrMapper.selectPersonone("法定代表人", id);
+		Map<String, String> Xfaq = null;
+		Map<String, String> Xfgl = null;
+		Map<String, String> Dwfz = null;
+		List<OrgUsr> orgUsrs = getIdByOrgCode(orgUsr.getBizOrgCode(), id);
+		List<Long> ids = orgUsrs.stream().map(x -> x.getSequenceNbr()).collect(Collectors.toList());
+		if (CollectionUtils.isNotEmpty(ids)) {
+			Xfaq = orgUsrMapper.getManagePerson("消防安全负责人", ids);
+			Xfgl = orgUsrMapper.getManagePerson("消防安全管理人", ids);
+			Dwfz = orgUsrMapper.getManagePerson("法定代表人", ids);
+		}
+		orgUsrFormVo.setXfaq(Xfaq != null ? Xfaq.get("uname") : "");
+		orgUsrFormVo.setXfgl(Xfgl != null ? Xfgl.get("uname") : "");
+		orgUsrFormVo.setDwfz(Dwfz != null ? Dwfz.get("uname") : "");
 		if (orgUsr.getParentId() != null) {
 			orgUsrFormVo.setParentName(getById(orgUsr.getParentId()).getBizOrgName());
 		}
@@ -2728,6 +2738,19 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		return this.baseMapper.selectList(wrapper).stream().collect(Collectors.toList());
 	}
 
+	private List<OrgUsr> getIdByOrgCode(String bizOrgCode, Long id) {
+		if (StringUtils.isEmpty(bizOrgCode)) {
+			return null;
+		}
+		LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
+		wrapper.likeRight(OrgUsr::getBizOrgCode,bizOrgCode);
+		wrapper.isNotNull(OrgUsr::getBizOrgCode);
+		wrapper.eq(BaseEntity::getIsDelete,false);
+		wrapper.eq(OrgUsr::getParentId, id);
+		wrapper.eq(OrgUsr::getBizOrgType, CommonConstant.BIZ_ORG_TYPE_PERSON);
+		return this.baseMapper.selectList(wrapper).stream().collect(Collectors.toList());
+	}
+
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public PeopleInfoDto peopleSave(PeopleInfoDto peopleInfoDto) {