修复bug

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

@@ -87,7 +87,7 @@ public interface IOrgUsrService {
 	 * @param
 	 * @throws Exception
 	 */
-	void saveOrgUsr (OrgUsr oriOrgUsr,Long id) throws Exception;
+	void saveOrgUsr (OrgUsr orgUsr, OrgUsr oriOrgUsr) throws Exception;
 
 	/**
 	 * 新增机构/部门/人员基本信息和动态表单数据

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

@@ -361,36 +361,16 @@ 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(ori.getRecUserId());
-		orgUsr.setRecUserName(ori.getRecUserName());
-		orgUsr.setAmosOrgId(ori.getAmosOrgId());
-		orgUsr.setAmosOrgCode(ori.getAmosOrgCode());
-
-		if (oriOrgUsr.getParentId() != null) {
-			if (ori.getParentId() != null && !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 if (ori.getParentId() == null && oriOrgUsr.getParentId() != null) {
-				OrgUsr parent = getById(oriOrgUsr.getParentId());
-				if (parent != null && ObjectUtils.isEmpty(oriOrgUsr.getBizOrgCode())) {
+	public void saveOrgUsr(OrgUsr orgUsr, OrgUsr oriOrgUsr) throws Exception {
+
+		if (oriOrgUsr.getParentId() != oriOrgUsr.getParentId()) {
+			OrgUsr parent = getById(orgUsr.getParentId());
+			if (parent != null && !ObjectUtils.isEmpty(parent.getBizOrgCode())) {
 				orgUsr.setBizOrgCode(parent.getBizOrgCode() + getOrgCodeStr());
 			}
-				updateChildOrgCode(ori.getBizOrgCode(), parent.getBizOrgCode());
+			updateChildOrgCode(oriOrgUsr.getBizOrgCode(), orgUsr.getBizOrgCode());
 			orgUsr.setParentId(oriOrgUsr.getParentId());
 		} 
-		} else {
-			orgUsr.setBizOrgCode(getOrgCodeStr());
-			updateChildOrgCode(ori.getBizOrgCode(), orgUsr.getBizOrgCode());
-		}
 		updateById(orgUsr);
 	}
 
@@ -557,15 +537,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		OrgUsr orgUsr = new OrgUsr();
 		OrgUsr oriOrgUsr = getById(id);
 		BeanUtils.copyProperties(OrgUsrVo, orgUsr);
-		if (orgUsr.getParentId() != null) {
-			OrgUsr parent = getById(orgUsr.getParentId());
-			if (parent != null && ObjectUtils.isEmpty(OrgUsrVo.getBizOrgCode())) {
-				orgUsr.setBizOrgCode(parent.getBizOrgCode() + getOrgCodeStr());
-			}
-		} else {
-			orgUsr.setBizOrgCode(getOrgCodeStr());
-		}
-		saveOrgUsr(orgUsr, id);
+		saveOrgUsr(orgUsr, oriOrgUsr);
 		// 保存动态表单数据
 		updateDynamicFormInstance(oriOrgUsr, orgUsr.getSequenceNbr(), OrgUsrVo.getDynamicFormValue());
 	}
@@ -576,6 +548,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		OrgUsr orgUsr = new OrgUsr();
 		OrgUsr oriOrgUsr = getById(id);
 		BeanUtils.copyProperties(OrgPersonVo, orgUsr);
+		orgUsr.setSequenceNbr(id);
 		if (!ObjectUtils.isEmpty(OrgPersonVo.getAmosOrgId())) {
 			AgencyUserModel user = Privilege.agencyUserClient.queryByUserId(OrgPersonVo.getAmosOrgId()).getResult();
 			oriOrgUsr.setAmosOrgCode(user.getRealName());
@@ -584,7 +557,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 			orgUsr.setAmosOrgId(user.getUserId());
 		}
 
-		saveOrgUsr(oriOrgUsr, id);
+		saveOrgUsr(orgUsr, oriOrgUsr);
 		// 保存动态表单数据
 		updateDynamicFormInstance(oriOrgUsr, orgUsr.getSequenceNbr(), OrgPersonVo.getDynamicFormValue());
 	}
@@ -709,15 +682,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		OrgUsr orgUsr = new OrgUsr();
 		OrgUsr oriOrgUsr = getById(id);
 		BeanUtils.copyProperties(OrgDepartmentVo, orgUsr);
-		if (orgUsr.getParentId() != null) {
-			OrgUsr parent = getById(orgUsr.getParentId());
-			if (parent != null && ObjectUtils.isEmpty(OrgDepartmentVo.getBizOrgCode())) {
-				orgUsr.setBizOrgCode(parent.getBizOrgCode() + getOrgCodeStr());
-			}
-		} else {
-			orgUsr.setBizOrgCode(getOrgCodeStr());
-		}
-		saveOrgUsr(orgUsr, id);
+		saveOrgUsr(orgUsr, oriOrgUsr);
 		// 保存动态表单数据
 		updateDynamicFormInstance(oriOrgUsr, orgUsr.getSequenceNbr(), OrgDepartmentVo.getDynamicFormValue());
 	}