修改代码

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

@@ -32,6 +32,7 @@ import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
@@ -77,18 +78,22 @@ public class WelderController extends BaseController {
     @ApiOperation(httpMethod = "POST", value = "新增人员信息", notes = "新增人员信息")
     public ResponseModel<OrgUsrDto> saveWelder(@RequestBody JSONObject jsonObject, @RequestParam String bizOrgType ,
                                             @RequestParam(required = false) String sequenceNbr) {
-        String sequenceNbrDept = orgService.getOrgUsrById(jsonObject.getString("sequenceNbr")).getParentId();
-        //修改部门时判断用户是否是部门负责人
-        if (!sequenceNbrDept.equals(jsonObject.getString("deptId"))) {
-            LambdaQueryWrapper<DynamicFormInstance> wrapperDept = new LambdaQueryWrapper<>();
-            wrapperDept.eq(DynamicFormInstance::getInstanceId, sequenceNbrDept);
-            List<DynamicFormInstance> list = alertFormValueServiceImpl.list(wrapperDept);
-            for (DynamicFormInstance i : list) {
-                if (i.getFieldValue().equals(jsonObject.getString("sequenceNbr"))) {
-                    return CommonResponseUtil.failure("该人员为该部门负责人，请解除");
+        //当有seq时判断是否已绑定项目
+        if (!ValidationUtil.isEmpty(sequenceNbr)){
+            String sequenceNbrDept = orgService.getOrgUsrById(jsonObject.getString("sequenceNbr")).getParentId();
+            //修改部门时判断用户是否是部门负责人
+            if (!sequenceNbrDept.equals(jsonObject.getString("deptId"))) {
+                LambdaQueryWrapper<DynamicFormInstance> wrapperDept = new LambdaQueryWrapper<>();
+                wrapperDept.eq(DynamicFormInstance::getInstanceId, sequenceNbrDept);
+                List<DynamicFormInstance> list = alertFormValueServiceImpl.list(wrapperDept);
+                for (DynamicFormInstance i : list) {
+                    if (i.getFieldValue().equals(jsonObject.getString("sequenceNbr"))) {
+                        return CommonResponseUtil.failure("该人员为该部门负责人，请解除");
+                    }
                 }
             }
         }
+
         return ResponseHelper.buildResponse(welderServiceImpl.savePerson(jsonObject, bizOrgType, sequenceNbr));
     }
     /**