修改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

@@ -119,7 +119,7 @@ public interface IOrgUsrService {
 
     OrgUsrDto updateByIdOrgUsr(OrgUsrDto OrgUsrDto, Long id) throws Exception;
 
-    void updateByIdOrgPerson(OrgPersonDto OrgPersonDto, Long id) throws Exception;
+    OrgPersonDto updateByIdOrgPerson(OrgPersonDto OrgPersonDto, Long id) throws Exception;
 
     OrgUsrFormDto selectCompanyById(Long id) throws Exception;
 
@@ -139,7 +139,7 @@ public interface IOrgUsrService {
 
     OrgUsrDto saveOrgDepartment(OrgDepartmentDto OrgDepartmentDto) throws Exception;
 
-    void updateByIdOrgDepartment(OrgDepartmentDto OrgDepartmentDto, Long id) throws Exception;
+    OrgDepartmentDto updateByIdOrgDepartment(OrgDepartmentDto OrgDepartmentDto, Long id) throws Exception;
 
     OrgDepartmentFormDto selectDepartmentById(Long id) throws Exception;
 

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

@@ -82,8 +82,8 @@ public class OrgDepartmentController {
     @ApiOperation(httpMethod = "PUT", value = "更新部门数据", notes = "更新部门数据")
     public ResponseModel<Object> updateByIdOrgUsr(HttpServletRequest request, @RequestBody OrgDepartmentDto OrgDepartmentVo, @PathVariable Long id) throws Exception {
     	OrgDepartmentVo.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_DEPARTMENT);
-    	iOrgUsrService.updateByIdOrgDepartment(OrgDepartmentVo, id);
-        return ResponseHelper.buildResponse(null);
+
+        return ResponseHelper.buildResponse(iOrgUsrService.updateByIdOrgDepartment(OrgDepartmentVo, id));
     }
 
 

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

@@ -97,8 +97,8 @@ public class OrgPersonController {
         /*同步修改关联账号用户名 chenzhao*/
         AgencyUserModel amosUser = Privilege.agencyUserClient.queryByUserId(OrgPersonVo.getAmosOrgId()).getResult();
         OrgPersonVo.setAmosOrgCode(amosUser.getRealName());
-        iOrgUsrService.updateByIdOrgPerson(OrgPersonVo, id);
-        return ResponseHelper.buildResponse(null);
+
+        return ResponseHelper.buildResponse(  iOrgUsrService.updateByIdOrgPerson(OrgPersonVo, id));
     }
 
 

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

@@ -779,7 +779,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	}
 
 	@Override
-	public void updateByIdOrgPerson(OrgPersonDto OrgPersonVo, Long id) throws Exception {
+	public OrgPersonDto updateByIdOrgPerson(OrgPersonDto OrgPersonVo, Long id) throws Exception {
 		// 修改人员信息
 		OrgUsr orgUsr = new OrgUsr();
 		OrgUsr oriOrgUsr = getById(id);
@@ -805,10 +805,13 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 			// orgUsr.setAmosOrgCode(user.getRealName()); 去掉AmosOrgCode by litw 2021年9月10日
 			orgUsr.setAmosOrgId(user.getUserId());
 		}
-
 		saveOrgUsr(orgUsr, oriOrgUsr);
 		// 保存动态表单数据
 		updateDynamicFormInstance(orgUsr.getSequenceNbr(), OrgPersonVo.getDynamicFormValue());
+		if (orgUsr.getBizOrgCode() != null){
+			OrgPersonVo.setBizOrgCode(orgUsr.getBizOrgCode());
+		}
+		return OrgPersonVo;
 	}
 
 	@Override
@@ -950,7 +953,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	}
 
 	@Override
-	public void updateByIdOrgDepartment(OrgDepartmentDto OrgDepartmentVo, Long id) throws Exception {
+	public OrgDepartmentDto updateByIdOrgDepartment(OrgDepartmentDto OrgDepartmentVo, Long id) throws Exception {
 		// 修改部门信息
 		OrgUsr orgUsr = new OrgUsr();
 		OrgUsr oriOrgUsr = getById(id);
@@ -966,6 +969,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		saveOrgUsr(orgUsr, oriOrgUsr);
 		// 保存动态表单数据
 		updateDynamicFormInstance(orgUsr.getSequenceNbr(), OrgDepartmentVo.getDynamicFormValue());
+		OrgDepartmentVo.setBizOrgCode(orgUsr.getBizOrgCode());
+		return OrgDepartmentVo ;
 	}
 
 	@Override