Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-lxh

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateOrderReq.java

@@ -17,7 +17,7 @@ import java.util.List;
 public class UpdateOrderReq extends BaseRequest implements Serializable {
     @NotBlank(message = "id不能为空",groups = {edit.class})
     private String id;
-
+    private String userId;
     private String examineState;
 
     /**

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/OrderMainServiceImpl.java

@@ -124,6 +124,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
             startProcessInstanceDTO.setProcessDefinitionId(req.getProcessDefinitionId());
             startProcessInstanceDTO.setOrderId(id);
             startProcessInstanceDTO.setOrderType("workOrder");
+            startProcessInstanceDTO.setUserId(req.getUserId());
             String ProcessInstanceId= WorkProcessService.start(startProcessInstanceDTO);
             order.setProcessId(ProcessInstanceId);
         }

jyzb-process/src/main/java/com/junmp/junmpProcess/dto/StartProcessInstanceDTO.java

@@ -19,4 +19,5 @@ public class StartProcessInstanceDTO {
     private JSONObject formData;
     private String orderId;
     private String orderType;
+    private String userId;
 }

jyzb-process/src/main/java/com/junmp/junmpProcess/service/Bussiness/impl/WorkProcessServiceImpl.java

@@ -641,9 +641,17 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
         try {
 
             LoginUser StartUser=new LoginUser();
-            StartUser.setUserId(Long.valueOf("1694954953210986498"));
+            if (processInstanceDto.getUserId()!=null)//优先拿接口中的信息，方便调试
+            {
+                StartUser.setUserId(Long.valueOf(processInstanceDto.getUserId()) );
+            }
+            else
+            {
+                StartUser= LoginContext.getContext().getLoginUser();
+            }
+//            StartUser.setUserId(Long.valueOf("1694954953210986498"));
 
-//            StartUser= LoginContext.getContext().getLoginUser();
+            StartUser= LoginContext.getContext().getLoginUser();
 
             JSONObject formData = processInstanceDto.getFormData();
             Authentication.setAuthenticatedUserId(StartUser.getUserId().toString());
@@ -1079,7 +1087,7 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
 
 
             }
-            return new ResponseResult(HttpStatus.SUCCESS,ReturnMsg.PASS,"");
+            return new ResponseResult(HttpStatus.SUCCESS,ReturnMsg.PASS,ReturnMsg.PASS);
 
         }
         else {
@@ -1220,7 +1228,7 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
         }
         runtimeService.deleteProcessInstance(task.getProcessInstanceId(), "拒绝");
 
-        return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS,"");
+        return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS,ReturnMsg.PASS);
     }