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

@@ -91,7 +91,7 @@ public interface IOrgUsrService {
      * @param orgUsr
      * @param alertFromValuelist
      */
-    void saveOrgUsrDynamicFormInstance(OrgUsr orgUsr, List<DynamicFormInstance> alertFromValuelist) throws Exception;
+    OrgUsrDto saveOrgUsrDynamicFormInstance(OrgUsr orgUsr, List<DynamicFormInstance> alertFromValuelist) throws Exception;
 
     /**
      * 更新机构/部门/人员基本信息和动态表单数据
@@ -110,9 +110,9 @@ public interface IOrgUsrService {
 
     List<OrgUsr> selectCompanyDepartmentMsg();
 
-    void saveOrgUsr(OrgUsrDto OrgUsrDto) throws Exception;
+    OrgUsrDto saveOrgUsr(OrgUsrDto OrgUsrDto) throws Exception;
 
-    void saveOrgPerson(OrgPersonDto OrgPersonDto) throws Exception;
+    OrgUsrDto saveOrgPerson(OrgPersonDto OrgPersonDto) throws Exception;
 
     void updateByIdOrgUsr(OrgUsrDto OrgUsrDto, Long id) throws Exception;
 
@@ -134,7 +134,7 @@ public interface IOrgUsrService {
 
     void savePersonList(List<OrgPersonDto> OrgPersonDto) throws Exception;
 
-    void saveOrgDepartment(OrgDepartmentDto OrgDepartmentDto) throws Exception;
+    OrgUsrDto saveOrgDepartment(OrgDepartmentDto OrgDepartmentDto) throws Exception;
 
     void updateByIdOrgDepartment(OrgDepartmentDto OrgDepartmentDto, 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

@@ -52,8 +52,8 @@ public class OrgDepartmentController {
     @ApiOperation(httpMethod = "POST", value = "新增部门信息", notes = "新增部门信息")
     public ResponseModel<Object> saveOrgUsr(HttpServletRequest request, @RequestBody OrgDepartmentDto OrgDepartmentVo) throws Exception {
     	OrgDepartmentVo.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_DEPARTMENT);
-    	iOrgUsrService.saveOrgDepartment(OrgDepartmentVo);
-        return ResponseHelper.buildResponse(null);
+
+        return ResponseHelper.buildResponse(iOrgUsrService.saveOrgDepartment(OrgDepartmentVo));
     }
 
     /**

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

@@ -53,8 +53,8 @@ public class OrgPersonController {
     @ApiOperation(httpMethod = "POST", value = "新增人员信息", notes = "新增人员信息")
     public ResponseModel<?> saveOrgUsr(HttpServletRequest request, @RequestBody OrgPersonDto OrgPersonVo) throws Exception {
         OrgPersonVo.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_PERSON);
-        iOrgUsrService.saveOrgPerson(OrgPersonVo);
-        return ResponseHelper.buildResponse(null);
+
+        return ResponseHelper.buildResponse( iOrgUsrService.saveOrgPerson(OrgPersonVo));
     }
 
     /**

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

@@ -87,10 +87,10 @@ public class OrgUsrController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "新增单位信息", notes = "新增单位信息")
-    public ResponseModel<?> saveOrgUsr(HttpServletRequest request, @RequestBody OrgUsrDto OrgUsrVo) throws Exception {
+    public ResponseModel<Object> saveOrgUsr(HttpServletRequest request, @RequestBody OrgUsrDto OrgUsrVo) throws Exception {
         OrgUsrVo.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_COMPANY);
-        iOrgUsrService.saveOrgUsr(OrgUsrVo);
-        return ResponseHelper.buildResponse(null);
+
+        return ResponseHelper.buildResponse(iOrgUsrService.saveOrgUsr(OrgUsrVo));
     }
 
     /**

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

@@ -492,33 +492,37 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	}
 
 	@Override
-	public void saveOrgUsrDynamicFormInstance(OrgUsr orgUsr, List<DynamicFormInstance> alertFromValuelist)
+	public OrgUsrDto saveOrgUsrDynamicFormInstance(OrgUsr orgUsr, List<DynamicFormInstance> alertFromValuelist)
 			throws Exception {
 		orgUsr.setRecDate(new Date());
 		AgencyUserModel user = Privilege.agencyUserClient.getme().getResult();
 		orgUsr.setRecUserName(user.getRealName());
 		orgUsr.setRecUserId(user.getUserId());
+		OrgUsrDto orgUsrDto = new OrgUsrDto();
+		BeanUtils.copyProperties(orgUsr,orgUsrDto);
 		// 单位新增情况
-		save(orgUsr);
+		OrgUsrDto model = createWithModel(orgUsrDto);
+		//	save(orgUsr);
 		// 填充主键
 		alertFromValuelist.stream().forEach(alertFromValue -> {
-			if (OrgPersonEnum.公司.getKey().equals(orgUsr.getBizOrgType())) {
+			if (OrgPersonEnum.公司.getKey().equals(orgUsrDto.getBizOrgType())) {
 				alertFromValue.setGroupCode(OrgPersonEnum.公司.getCode());
-			} else if (OrgPersonEnum.部门.getKey().equals(orgUsr.getBizOrgType())) {
+			} else if (OrgPersonEnum.部门.getKey().equals(orgUsrDto.getBizOrgType())) {
 				alertFromValue.setGroupCode(OrgPersonEnum.部门.getCode());
 			}
-			alertFromValue.setInstanceId(orgUsr.getSequenceNbr());
+			alertFromValue.setInstanceId(orgUsrDto.getSequenceNbr());
 		});
 		// 保存动态表单数据
 		alertFormValueServiceImpl.saveBatch(alertFromValuelist);
-		OrgUsrFormDto formDto = this.selectCompanyById(orgUsr.getSequenceNbr());
-		if (OrgPersonEnum.公司.getKey().equals(orgUsr.getBizOrgType())) {
+		OrgUsrFormDto formDto = this.selectCompanyById(orgUsrDto.getSequenceNbr());
+		if (OrgPersonEnum.公司.getKey().equals(orgUsrDto.getBizOrgType())) {
 			try {
 				emqKeeper.getMqttClient().publish(airportAddTopic, JSON.toJSONString(formDto).getBytes(), 2, false);
 			} catch (Exception e) {
 				e.getMessage();
 			}
 		}
+		return model;
 	}
 
 	@Override
@@ -628,7 +632,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	}
 
 	@Override
-	public void saveOrgUsr(OrgUsrDto OrgUsrVo) throws Exception {
+	public OrgUsrDto saveOrgUsr(OrgUsrDto OrgUsrVo) throws Exception {
 		OrgUsr orgUsr = new OrgUsr();
 		BeanUtils.copyProperties(OrgUsrVo, orgUsr);
 		orgUsr.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_COMPANY);
@@ -640,16 +644,17 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		} else {
 			orgUsr.setBizOrgCode(getOrgCodeStr());
 		}
-		saveOrgUsrDynamicFormInstance(orgUsr, OrgUsrVo.getDynamicFormValue());
+		OrgUsrDto orgUsrDto = saveOrgUsrDynamicFormInstance(orgUsr, OrgUsrVo.getDynamicFormValue());
 
 		/**
 		 * 同步保存ES
 		 */
 		eSOrgUsrService.saveAlertCalledToES(orgUsr);
+		return orgUsrDto;
 	}
 
 	@Override
-	public void saveOrgPerson(OrgPersonDto OrgPersonVo) throws Exception {
+	public OrgUsrDto saveOrgPerson(OrgPersonDto OrgPersonVo) throws Exception {
 		OrgUsr orgUsr = new OrgUsr();
 		BeanUtils.copyProperties(OrgPersonVo, orgUsr);
 		orgUsr.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_PERSON);
@@ -662,7 +667,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 			orgUsr.setBizOrgCode(getOrgCodeStr());
 		}
 
-		saveOrgUsrDynamicFormInstance(orgUsr, OrgPersonVo.getDynamicFormValue());
+	return 	saveOrgUsrDynamicFormInstance(orgUsr, OrgPersonVo.getDynamicFormValue());
 	}
 
 	public void saveOrgPersonExcel(OrgUsrExcelDto OrgPersonVo) throws Exception {
@@ -881,7 +886,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	}
 
 	@Override
-	public void saveOrgDepartment(OrgDepartmentDto OrgDepartmentVo) throws Exception {
+	public OrgUsrDto saveOrgDepartment(OrgDepartmentDto OrgDepartmentVo) throws Exception {
 		OrgUsr orgUsr = new OrgUsr();
 		BeanUtils.copyProperties(OrgDepartmentVo, orgUsr);
 		orgUsr.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_DEPARTMENT);
@@ -893,7 +898,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		} else {
 			orgUsr.setBizOrgCode(getOrgCodeStr());
 		}
-		saveOrgUsrDynamicFormInstance(orgUsr, OrgDepartmentVo.getDynamicFormValue());
+		return saveOrgUsrDynamicFormInstance(orgUsr, OrgDepartmentVo.getDynamicFormValue());
 	}
 
 	@Override