bug 2880

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

@@ -23,6 +23,9 @@ public interface OrgUsrMapper extends BaseMapper<OrgUsr> {
 
     List<Map<String, Object>> selectPersonList(@Param("map")Map<String, Object> map);
 
+    //BUG 2880  by litw start 2021年9月16日
+    List<OrgUsr> selectAllChildrenList(@Param("map")Map<String, Object> map);
+
 	List<OrgUsr> selectCompanyDepartmentMsg();
 
 	List<Map<String, Object>> selectPersonAllList(Map<String, Object> map);

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

@@ -41,9 +41,6 @@
         <if test="bizOrgCode != null and bizOrgCode != '-1'">
             AND u.biz_org_code like concat(#{bizOrgCode}, '%')
         </if>
-        <if test="parentId != null and parentId != '-1'">
-            AND u.parent_id like concat(#{map.parentId}, '%')
-        </if>
         GROUP BY
         u.sequence_nbr ,
         u.biz_org_name ,
@@ -85,9 +82,6 @@
         <if test="map.bizOrgCode != null and map.bizOrgCode != '-1'">
             AND u.biz_org_code like concat(#{map.bizOrgCode}, '%')
         </if>
-        <if test="map.parentId != null and map.parentId != '-1'">
-            AND u.parent_id like concat(#{map.parentId}, '%')
-        </if>
         GROUP BY
         u.sequence_nbr ,
         u.biz_org_name ,
@@ -100,6 +94,21 @@
         LIMIT #{map.pageNum}, #{map.pageSize}
     </select>
 
+    <!--机场单位查询机构下所有子数据 2021-09-16 by litw  -->
+    <select id="selectAllChildrenList" resultType="com.yeejoin.amos.boot.module.common.api.entity.OrgUsr">
+        select
+        u.sequence_nbr sequenceNbr,
+        u.biz_org_name bizOrgName,
+        u.biz_org_code bizOrgCode
+        FROM
+        cb_org_usr u
+        where
+         u.is_delete = 0
+        <if test="map.bizOrgCode != null and map.bizOrgCode != '-1'">
+            AND u.biz_org_code like concat(#{map.bizOrgCode}, '%')
+        </if>
+    </select>
+
 
     <select id="selectPersonAllList" resultType="Map">
         select * from (

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

@@ -364,9 +364,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         }
         /*BUG2680 查询部门人员错误 传递参数类型不正确 修改为string 2021-09-14 陈召 开始*/
         if (req.get("parentId") != null && req.get("parentId") != ""){
-           //  OrgUsr parent = this.getById(req.get("parentId").toString());
-            map.put("parentId", req.get("parentId"));
-          //  map.put("bizOrgCode", ObjectUtils.isEmpty(parent) ? null : parent.getBizOrgCode());
+             OrgUsr parent = this.getById(req.get("parentId").toString());
+             map.put("bizOrgCode", ObjectUtils.isEmpty(parent) ? null : parent.getBizOrgCode());
         }
         /*BUG2680 查询部门人员错误 传递参数类型不正确 修改为string 2021-09-14 陈召 开始*/
 
@@ -673,6 +672,16 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
             orgUsr.setBizOrgCode(parent.getBizOrgCode() + getOrgCodeStr());
         }
         orgUsr.setSequenceNbr(id);
+        // 查询机构下的所有部门单位人员数据，进行bizOrgCode的统一修改  BUG 2880  by litw start 2021年9月16日
+        String oriOrgCode = oriOrgUsr.getBizOrgCode();
+        Map<String, Object> columnMap = new HashMap<>();
+        columnMap.put("bizOrgCode", oriOrgCode);
+        List<OrgUsr> list =  orgUsrMapper.selectAllChildrenList(columnMap);
+        list.stream().forEach(e->{
+            e.setBizOrgCode(e.getBizOrgCode().replace(oriOrgCode,orgUsr.getBizOrgCode()));
+        });
+        this.updateBatchById(list);
+
         /*单位编辑后 code值也应做出修改 2021-09-09 陈召 结束  */
         saveOrgUsr(orgUsr, oriOrgUsr);
         // 保存动态表单数据