12

platform-common/src/main/java/com/platform/common/constant/CommonConstants.java

@@ -264,7 +264,7 @@ public interface CommonConstants {
     String SB_STOP_FORM = "sb_info_stop"; // 设备停用单
     String SB_ALLOCATE_FORM = "sb_info_allocate"; // 设备调拨单
     String OUT_STORE_BACK = "out_store_back"; // 仓库调拨
-    String OUT_STORE_BACK_GWL = "out_store_back_gwl_1"; // 仓库调拨
+    String OUT_STORE_BACK_GWL = "out_store_back_gwl_3"; // 仓库调拨
     String REPAIR_STATUS_RECORD = "repair_status_record"; // 维修状态记录
     String REPAIR_RECORD = "repair_record"; // 维修记录
     String DISPATCH_RECORD = "dispatch_record"; // 转派记录

platform-service/src/main/java/com/platform/service/customize/BaseFormCheckServiceAbstract.java

@@ -92,7 +92,7 @@ public abstract class BaseFormCheckServiceAbstract implements BaseFormCheckServi
      */
     private void insertNecessaryValue(Map<String, String> maps,String dataId){
         CustomFieldTemplateData data = getById(dataId);
-        if(CommonConstants.SB_ALLOCATE_FORM.equals(data.getRemark())){
+        if(data != null && CommonConstants.SB_ALLOCATE_FORM.equals(data.getRemark())){
             SbAllocateFormActiviti activiti = JsonUtils.jsonToModel(data.getData(),SbAllocateFormActiviti.class);
             maps.put("targetDept",activiti.getTargetDept());
         }
@@ -171,22 +171,17 @@ public abstract class BaseFormCheckServiceAbstract implements BaseFormCheckServi
         UserInfo user = SecurityUtils.getUserInfo();
         if (doAudit(actAuditRequest)) {
             if (!doCheckLast(actAuditRequest)) {
-                //若ProjectName含有包含‘龚文林’或者projectName==null,才分配下一个节点,否则结束审批
-                if (actAuditRequest.getOutStoreFlag()==null||(actAuditRequest.getProjectName()!=null&&actAuditRequest.getProjectName().contains("龚文林"))) {
-                    // 分配下一个节点的审批人信息
-                    Model model = repositoryService.createModelQuery().modelKey(actAuditRequest.getAuditModelKey()).singleResult();
-                    List<ActivitiUserModel> list = activitiUserModelService.getModelByModelId(model.getId());
-                    if (CollectionUtil.isEmpty(list)) {
-                        throw new BusinessException("审批节点未设置，请先设置");
-                    }
-                    Map<String, String> maps = new HashMap<>();
-                    maps.put("userId", user.getUserId());
-                    Task nextTask = taskService.createTaskQuery().processInstanceId(actAuditRequest.getProcessInstanceId()).orderByTaskCreateTime().desc().singleResult();
-                    insertNecessaryValue(maps, actAuditRequest.getId());
-                    modifyTaskAssign(model.getId(), maps, nextTask, list);
-                }else {
-                    doFinish(actAuditRequest);
+                // 分配下一个节点的审批人信息
+                Model model = repositoryService.createModelQuery().modelKey(actAuditRequest.getAuditModelKey()).singleResult();
+                List<ActivitiUserModel> list = activitiUserModelService.getModelByModelId(model.getId());
+                if (CollectionUtil.isEmpty(list)) {
+                    throw new BusinessException("审批节点未设置，请先设置");
                 }
+                Map<String, String> maps = new HashMap<>();
+                maps.put("userId", user.getUserId());
+                Task nextTask = taskService.createTaskQuery().processInstanceId(actAuditRequest.getProcessInstanceId()).orderByTaskCreateTime().desc().singleResult();
+                insertNecessaryValue(maps, actAuditRequest.getId());
+                modifyTaskAssign(model.getId(), maps, nextTask, list);
             } else {
                 doFinish(actAuditRequest);
             }