修改bug

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

@@ -46,7 +46,7 @@ import io.swagger.annotations.ApiOperation;
  */
 @RestController
 @Api(tags = "部门Api")
-@RequestMapping(value = "/jcs/org-department")
+@RequestMapping(value = "/org-department")
 public class OrgDepartmentController {
     @Autowired
     OrgUsrServiceImpl iOrgUsrService;
@@ -62,7 +62,8 @@ public class OrgDepartmentController {
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "新增部门信息", notes = "新增部门信息")
     public ResponseModel<Object> saveOrgUsr(HttpServletRequest request, @RequestBody OrgDepartmentVo OrgDepartmentVo) throws Exception {
-       iOrgUsrService.saveOrgDepartment(OrgDepartmentVo);
+    	OrgDepartmentVo.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_DEPARTMENT);
+    	iOrgUsrService.saveOrgDepartment(OrgDepartmentVo);
         return ResponseHelper.buildResponse(null);
     }
 
@@ -91,7 +92,8 @@ public class OrgDepartmentController {
     @RequestMapping(value = "/{id}", method = RequestMethod.PUT)
     @ApiOperation(httpMethod = "PUT", value = "更新部门数据", notes = "更新部门数据")
     public ResponseModel<Object> updateByIdOrgUsr(HttpServletRequest request, @RequestBody OrgDepartmentVo OrgDepartmentVo, @PathVariable Long id) throws Exception {
-        iOrgUsrService.updateByIdOrgDepartment(OrgDepartmentVo, id);
+    	OrgDepartmentVo.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_DEPARTMENT);
+    	iOrgUsrService.updateByIdOrgDepartment(OrgDepartmentVo, id);
         return ResponseHelper.buildResponse(null);
     }
 

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

@@ -57,6 +57,7 @@ public class OrgPersonController {
 	@RequestMapping(value = "/save", method = RequestMethod.POST)
 	@ApiOperation(httpMethod = "POST", value = "新增人员信息", notes = "新增人员信息")
 	public ResponseModel saveOrgUsr(HttpServletRequest request, @RequestBody OrgPersonVo OrgPersonVo) throws Exception {
+		OrgPersonVo.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_PERSON);
 		iOrgUsrService.saveOrgPerson(OrgPersonVo);
 		return ResponseHelper.buildResponse(null);
 	}
@@ -85,6 +86,7 @@ public class OrgPersonController {
 	@RequestMapping(value = "/{id}", method = RequestMethod.PUT)
 	@ApiOperation(httpMethod = "PUT", value = "更新单位数据", notes = "更新单位数据")
 	public ResponseModel updateByIdOrgUsr(HttpServletRequest request, @RequestBody OrgPersonVo OrgPersonVo, @PathVariable Long id) throws Exception {
+		OrgPersonVo.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_PERSON);
 		iOrgUsrService.updateByIdOrgPerson(OrgPersonVo,id);
 		return ResponseHelper.buildResponse(null);
 	}

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

@@ -66,7 +66,8 @@ public class  OrgUsrController extends BaseController {
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "新增单位信息", notes = "新增单位信息")
     public ResponseModel saveOrgUsr(HttpServletRequest request, @RequestBody OrgUsrVo OrgUsrVo) throws Exception {
-        iOrgUsrService.saveOrgUsr(OrgUsrVo);
+    	OrgUsrVo.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_COMPANY);
+    	iOrgUsrService.saveOrgUsr(OrgUsrVo);
         return ResponseHelper.buildResponse(null);
     }
 
@@ -95,7 +96,8 @@ public class  OrgUsrController extends BaseController {
     @RequestMapping(value = "/{id}", method = RequestMethod.PUT)
     @ApiOperation(httpMethod = "PUT", value = "更新单位数据", notes = "更新单位数据")
     public ResponseModel updateByIdOrgUsr(HttpServletRequest request, @RequestBody OrgUsrVo OrgUsrVo, @PathVariable Long id) throws Exception {
-       iOrgUsrService.updateByIdOrgUsr(OrgUsrVo,id);
+    	OrgUsrVo.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_COMPANY);
+    	iOrgUsrService.updateByIdOrgUsr(OrgUsrVo,id);
         return ResponseHelper.buildResponse(null);
     }
 

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

@@ -218,6 +218,9 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
                 QueryWrapper phoneWrapper = new QueryWrapper<AlertFormValue>();
                 phoneWrapper.allEq(phone);
                 AlertFormValue phoneValue = alertFormValueServiceImpl.getOne(phoneWrapper);
+                if (phoneValue == null) {
+                	throw new Exception("表单数据错误");
+                }
                 resultMap.put("tel", phoneValue.getFieldValue());
                 // 获取单位人员列表信息
                 personList = listPerson(company.getSequenceNbr()+"").stream().map( p -> {
@@ -327,7 +330,6 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
     @Override
     public void saveOrgUsr(OrgUsr oriOrgUsr, Long id) throws Exception {
         OrgUsr orgUsr = new OrgUsr();
-        orgUsr.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_PERSON);
         orgUsr.setSequenceNbr(id);
         orgUsr.setRecDate(new Date());
         orgUsr.setRecUserId(oriOrgUsr.getRecUserId());
@@ -360,21 +362,30 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
             alertFromValue.setAlertCalledId(orgUsr.getSequenceNbr());
         });
         List<AlertFromValueDto> formList = alertFormValueServiceImpl.queryByCalledId(orgUsr.getSequenceNbr());
-        for (AlertFormValue dis : alertFromValuelist) {
-            for (AlertFromValueDto src : formList) {
-                if (dis.getAlertFormId() == src.getAlertFormId()) {
-                    dis.setSequenceNbr(src.getSequenceNbr());
-                    dis.setRecDate(new Date());
-                    dis.setRecUserId(orgUsr.getRecUserId());
-                    dis.setRecUserName(orgUsr.getRecUserName());
-                    dis.setAlertTypeCode(src.getAlertTypeCode());
-                    dis.setAlertFormId(src.getAlertFormId());
-                    break;
+        if (formList != null && formList.size() > 0) {
+        	for (AlertFormValue dis : alertFromValuelist) {
+                for (AlertFromValueDto src : formList) {
+                    if (dis.getAlertFormId() == src.getAlertFormId()) {
+                        dis.setSequenceNbr(src.getSequenceNbr());
+                        dis.setRecDate(new Date());
+                        dis.setRecUserId(orgUsr.getRecUserId());
+                        dis.setRecUserName(orgUsr.getRecUserName());
+                        dis.setAlertTypeCode(src.getAlertTypeCode());
+                        dis.setAlertFormId(src.getAlertFormId());
+                        break;
+                    }
                 }
             }
+        	// 保存动态表单数据
+            alertFormValueServiceImpl.updateBatchById(alertFromValuelist);
+        } else {
+        	 // 填充主键
+            alertFromValuelist.stream().forEach(alertFromValue -> {
+                alertFromValue.setAlertCalledId(orgUsr.getSequenceNbr());
+            });
+            // 保存动态表单数据
+            alertFormValueServiceImpl.saveBatch(alertFromValuelist);
         }
-        // 保存动态表单数据
-        alertFormValueServiceImpl.updateBatchById(alertFromValuelist);
     }
 
     @Override