修复bug

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

 package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jcs.api.dto.OrgUsrDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsr;
 import org.apache.ibatis.annotations.Param;
 
@@ -24,4 +25,6 @@ public interface OrgUsrMapper extends BaseMapper<OrgUsr> {
 	List<OrgUsr> selectCompanyDepartmentMsg();
 
 	List<Map<String, Object>> selectPersonAllList(Map<String, Object> map);
+
+	List<OrgUsr> queryOrgUsrListByBizOrgCode(String bizOrgCode);
 }

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

@@ -124,4 +124,34 @@
 		is_delete = 0
 		and biz_org_type = "COMPANY" or biz_org_type =  "DEPARTMENT"
 	</select>
+	
+	<select id="queryOrgUsrListByBizOrgCode" resultType="com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsr">
+		SELECT
+		sequence_nbr,
+		biz_org_name,
+		biz_org_code,
+		amos_org_id,
+		amos_org_code,
+		biz_org_type,
+		build_name,
+		build_id,
+		parent_id,
+		org_expand_attr1,
+		org_expand_attr2,
+		org_expand_attr3,
+		org_expand_attr4,
+		org_expand_attr5,
+		org_expand_attr6,
+		org_expand_attr7,
+		org_expand_attr8,
+		rec_user_name,
+		rec_user_id,
+		rec_date,
+		is_delete
+		FROM
+		`cb_org_usr`
+		WHERE
+		is_delete = 0
+		and biz_org_code like concat(#{bizOrgCode}, '%')
+	</select>
 </mapper>

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

@@ -259,7 +259,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         	map.put("bizOrgName", req.get("bizOrgName"));
         }
         OrgUsr parent = this.getById( Long.valueOf(req.get("parentId").toString()));
-        map.put("bizOrgCode", parent.getBizOrgCode());
+        map.put("bizOrgCode", ObjectUtils.isEmpty(parent) ? null : parent.getBizOrgCode());
         req.remove("bizOrgName");
         req.remove("pageSize");
         req.remove("pageNum");
@@ -310,23 +310,46 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
     @Override
     public void saveOrgUsr(OrgUsr oriOrgUsr, Long id) throws Exception {
         OrgUsr orgUsr = new OrgUsr();
+        OrgUsr ori = getById(id);
         orgUsr.setSequenceNbr(id);
         orgUsr.setRecDate(new Date());
-        orgUsr.setRecUserId(oriOrgUsr.getRecUserId());
-        orgUsr.setRecUserName(oriOrgUsr.getRecUserName());
-        orgUsr.setAmosOrgId(oriOrgUsr.getAmosOrgId());
-        orgUsr.setAmosOrgCode(oriOrgUsr.getAmosOrgCode());
+        orgUsr.setRecUserId(ori.getRecUserId());
+        orgUsr.setRecUserName(ori.getRecUserName());
+        orgUsr.setAmosOrgId(ori.getAmosOrgId());
+        orgUsr.setAmosOrgCode(ori.getAmosOrgCode());
+        
         if (oriOrgUsr.getParentId() != null) {
+        	if (!ori.getParentId().equals(oriOrgUsr.getParentId())) {
         		OrgUsr parent = getById(oriOrgUsr.getParentId());
                 if (parent != null && ObjectUtils.isEmpty(oriOrgUsr.getBizOrgCode())) {
                 	orgUsr.setBizOrgCode(parent.getBizOrgCode() + getOrgCodeStr());
                 }
+                updateChildOrgCode(ori.getBizOrgCode(), parent.getBizOrgCode());
+                orgUsr.setParentId(oriOrgUsr.getParentId());
+        	}
         } else {
         	orgUsr.setBizOrgCode(getOrgCodeStr());
+        	updateChildOrgCode(ori.getBizOrgCode(), orgUsr.getBizOrgCode());
         }
         updateById(orgUsr);
     }
     
+    
+    private void updateChildOrgCode(String oriOrgCode, String targetOrgCode) {
+    	List<OrgUsr> list = queryOrgUsrList(oriOrgCode);
+    	if (ObjectUtils.isEmpty(list)) {
+    		return;
+    	}
+    	list.forEach(action -> {
+    		action.setBizOrgCode(action.getBizOrgCode().replace(oriOrgCode, targetOrgCode));
+    		updateById(action);
+    	});
+    }
+    
+    public List<OrgUsr> queryOrgUsrList(String bizOrgCode) {
+    	return this.baseMapper.queryOrgUsrListByBizOrgCode(bizOrgCode);
+    }
+
     @Override
     public void saveOrgUsrAlertFormValue(OrgUsr orgUsr, List<AlertFormValue> alertFromValuelist) {
     	orgUsr.setRecDate(new Date());
@@ -483,7 +506,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         } else {
         	orgUsr.setBizOrgCode(getOrgCodeStr());
         }
-        saveOrgUsr(oriOrgUsr, id);
+        saveOrgUsr(orgUsr, id);
         // 保存动态表单数据
         updateAlertFormValue(oriOrgUsr, orgUsr.getSequenceNbr(), OrgUsrVo.getAlertFormValue());
     }
@@ -632,7 +655,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         } else {
         	orgUsr.setBizOrgCode(getOrgCodeStr());
         }
-        saveOrgUsr(oriOrgUsr, id);
+        saveOrgUsr(orgUsr, id);
         // 保存动态表单数据
         updateAlertFormValue(oriOrgUsr, orgUsr.getSequenceNbr(), OrgDepartmentVo.getAlertFormValue());
     }