Merge pull request 'fix: 修改任务审批' (#118) from fix/UpdateFlowComplete20240416 into test

Reviewed-on: #118

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java

@@ -142,6 +142,7 @@ public class FlowTaskController extends BaseController {
     @PostMapping("/completeFlow")
     @ResponseBody
     public ResultVo complete(@RequestBody FlowApprove approve, HttpServletRequest request) {
+
         UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
         Integer flag = flowTaskService.complete(approve, userToken, Arrays.asList(approve.getFlowTaskInfoList().get(0).getFormId()));
         return flag > 0 ? ResultVoUtil.success() : ResultVoUtil.error();
@@ -156,6 +157,11 @@ public class FlowTaskController extends BaseController {
     @PostMapping("/completeBatchFlow")
     @ResponseBody
     public ResultVo completeBatch(@RequestBody FlowApprove approve, HttpServletRequest request) {
+        String tenantId = request.getHeader("X-Tenant-Id");
+        if(StringUtils.isBlank(tenantId)){
+            return ResultVoUtil.error("租户主键不能为空");
+        }
+        approve.setDeptid(tenantId);
         UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
         //任务ID
         List<FlowTaskInfo> flowTaskInfoList = approve.getFlowTaskInfoList();