Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/WelderController.java

@@ -87,14 +87,17 @@ public class WelderController extends BaseController {
                 wrapperDept.eq(DynamicFormInstance::getInstanceId, sequenceNbrDept);
                 List<DynamicFormInstance> list = alertFormValueServiceImpl.list(wrapperDept);
                 for (DynamicFormInstance i : list) {
+                    //不为空时进入
+                    if (!ValidationUtil.isEmpty(i.getFieldValue())){
                     if (i.getFieldValue().equals(jsonObject.getString("sequenceNbr"))) {
                         return CommonResponseUtil.failure("该人员为该部门负责人，请解除");
                     }
-                }
+                }}
             }
         }
         try {
-            return ResponseHelper.buildResponse(welderServiceImpl.savePerson(jsonObject, bizOrgType, sequenceNbr));
+            OrgUsrDto orgUsrDto = welderServiceImpl.savePerson(jsonObject, bizOrgType, sequenceNbr);
+            return ResponseHelper.buildResponse(orgUsrDto);
         }catch (Exception e){
             return CommonResponseUtil.failure("该用户绑定的手机号已存在，请更换号码");
         }