流程修改

distributed-print/src/main/java/com/qmth/distributed/print/api/TFFlowController.java

@@ -99,8 +99,7 @@ public class TFFlowController {
             }
             activitiService.uploadDeployment(file);
             SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-            Long schoolId = Objects.nonNull(ServletUtil.getRequestHeaderSchoolIdByNotVaild()) && !Objects.equals("", ServletUtil.getRequestHeaderSchoolIdByNotVaild()) ? Long.parseLong(ServletUtil.getRequestHeaderSchoolIdByNotVaild().toString()) : sysUser.getSchoolId();
-            TFFlow tfFlow = new TFFlow(schoolId, sysUser.getOrgId(), Objects.isNull(name) ? fileName : name, publish, sysUser.getId());
+            TFFlow tfFlow = new TFFlow(SystemConstant.getHeadOrUserSchoolId(), sysUser.getOrgId(), Objects.isNull(name) ? fileName : name, publish, sysUser.getId());
             tfFlowService.save(tfFlow);
         } catch (Exception e) {
             log.error("请求出错", e);
@@ -140,8 +139,7 @@ public class TFFlowController {
                        @ApiParam(value = "页码", required = true) @RequestParam Integer pageNumber,
                        @ApiParam(value = "数量", required = true) @RequestParam Integer pageSize) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        Long schoolId = Objects.nonNull(ServletUtil.getRequestHeaderSchoolIdByNotVaild()) && !Objects.equals("", ServletUtil.getRequestHeaderSchoolIdByNotVaild()) ? Long.parseLong(ServletUtil.getRequestHeaderSchoolIdByNotVaild().toString()) : sysUser.getSchoolId();
-        return ResultUtil.ok(tfFlowService.list(new Page<>(pageNumber, pageSize), name, schoolId, sysUser.getOrgId()));
+        return ResultUtil.ok(tfFlowService.list(new Page<>(pageNumber, pageSize), name, SystemConstant.getHeadOrUserSchoolId(), sysUser.getOrgId()));
     }
 
     @ApiOperation(value = "启动流程")

distributed-print/src/main/java/com/qmth/distributed/print/api/WorkController.java

@@ -88,23 +88,21 @@ public class WorkController {
 //        return ResultUtil.ok(examTaskService.queryByMyWorkSubmit(new Page<>(SystemConstant.PAGE_NUMBER, SystemConstant.PAGE_SIZE), sysUser.getId(), sysUser.getSchoolId(), ExamStatusEnum.SUBMIT).getRecords().size());
 //    }
 
-    @ApiOperation(value = "获取待办计数接口")
+    @ApiOperation(value = "获取待办接口")
     @RequestMapping(value = "/exam/task/ready", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = WorkResult.class)})
     public Result getFlowTaskReady(@ApiParam(value = "页码", required = true) @RequestParam Integer pageNumber,
                                    @ApiParam(value = "数量", required = true) @RequestParam Integer pageSize) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        Long schoolId = Objects.nonNull(ServletUtil.getRequestHeaderSchoolIdByNotVaild()) ? (Long) ServletUtil.getRequestHeaderSchoolIdByNotVaild() : sysUser.getSchoolId();
-        return ResultUtil.ok(examTaskService.getFlowTaskReadyList(new Page<>(pageNumber, pageSize), schoolId, sysUser.getOrgId(), sysUser.getId()));
+        return ResultUtil.ok(examTaskService.getFlowTaskReadyList(new Page<>(pageNumber, pageSize), SystemConstant.getHeadOrUserSchoolId(), sysUser.getOrgId(), sysUser.getId()));
     }
 
-    @ApiOperation(value = "获取待办接口")
+    @ApiOperation(value = "获取待办计数接口")
     @RequestMapping(value = "/exam/task/ready_count", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = WorkResult.class)})
     public Result getFlowTaskReadyCount() {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        Long schoolId = Objects.nonNull(ServletUtil.getRequestHeaderSchoolIdByNotVaild()) ? (Long) ServletUtil.getRequestHeaderSchoolIdByNotVaild() : sysUser.getSchoolId();
-        return ResultUtil.ok(examTaskService.getFlowTaskReadyList(new Page<>(SystemConstant.PAGE_NUMBER, SystemConstant.PAGE_SIZE), schoolId, sysUser.getOrgId(), sysUser.getId()).getRecords().size());
+        return ResultUtil.ok(examTaskService.getFlowTaskReadyList(new Page<>(SystemConstant.PAGE_NUMBER, SystemConstant.PAGE_SIZE), SystemConstant.getHeadOrUserSchoolId(), sysUser.getOrgId(), sysUser.getId()).getRecords().size());
     }
 }
 

teachcloud-common/src/main/java/com/qmth/teachcloud/common/contant/SystemConstant.java

@@ -1,7 +1,9 @@
 package com.qmth.teachcloud.common.contant;
 
 import com.qmth.boot.core.uid.service.UidService;
+import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
+import com.qmth.teachcloud.common.util.ServletUtil;
 
 import java.io.File;
 import java.nio.charset.Charset;
@@ -294,4 +296,9 @@ public class SystemConstant {
     public static boolean longNotNull(Long x) {
         return x != null && x > 0;
     }
+
+    public static Long getHeadOrUserSchoolId() {
+        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+        return Objects.nonNull(ServletUtil.getRequestHeaderSchoolIdByNotVaild()) ? Long.parseLong(ServletUtil.getRequestHeaderSchoolIdByNotVaild().toString()) : sysUser.getSchoolId();
+    }
 }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/TeachcloudCommonServiceImpl.java

@@ -247,7 +247,7 @@ public class TeachcloudCommonServiceImpl implements TeachcloudCommonService {
                 int count = Objects.nonNull(sysRoleList) && sysRoleList.size() > 0 ? (int) sysRoleList.stream().filter(s -> Objects.equals(s.getName(), RoleTypeEnum.ADMIN.getDesc())).count() : 0;
                 QueryWrapper<SysPrivilege> sysPrivilegeQueryWrapper = new QueryWrapper<>();
                 if (count > 0) {//超级系统管理员
-                    Long schoolId = (Long) ServletUtil.getRequestHeaderSchoolIdByNotVaild();
+                    Long schoolId = Long.parseLong(ServletUtil.getRequestHeaderSchoolIdByNotVaild().toString());
                     sysPrivilegeQueryWrapper.lambda().eq(SysPrivilege::getSchoolId, schoolId)
                             .eq(SysPrivilege::getType, PrivilegeEnum.URL)
                             .eq(SysPrivilege::getProperty, PrivilegePropertyEnum.AUTH);