部门文件增加审批字段

ruoyi-auth/src/main/java/org/dromara/auth/controller/TokenController.java

@@ -101,7 +101,7 @@ public class TokenController {
         LoginVo loginVo = IAuthStrategy.login(body, clientVo, grantType);
 
         Long userId = LoginHelper.getUserId();
-        if(!ObjectUtil.isNotNull(userId)){
+        if (ObjectUtil.isNotNull(userId)) {
             scheduledExecutorService.schedule(() -> {
                 remoteMessageService.publishMessage(userId, "欢迎登录商旅微服务管理系统");
             }, 3, TimeUnit.SECONDS);

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FileApproveController.java

@@ -49,7 +49,6 @@ public class FileApproveController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("workflow:fileApprove:query")
     @GetMapping("/{id}")
     public R<FileApproveVo> getInfo(@NotNull(message = "主键不能为空")
                                     @PathVariable Long id) {

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FileApproveServiceImpl.java

@@ -118,7 +118,8 @@ public class FileApproveServiceImpl extends AbstractBaseService<FileApproveVo, F
     @EventListener(condition = "#processTaskEvent.key.startsWith('dept_file_approve')")
     public void processTaskHandler(ProcessTaskEvent processTaskEvent) {
         // 所有demo案例的申请人节点id
-        String[] ids = workflowService.getTaskDefinitionKeyListByBusinessKey(processTaskEvent.getBusinessKey());
+//        String[] ids = workflowService.getTaskDefinitionKeyListByBusinessKey(processTaskEvent.getBusinessKey());
+        String[] ids = {"dept_file_approve_submit", "dept_file_download_approve"};
         if (StringUtils.equalsAny(processTaskEvent.getTaskDefinitionKey(), ids)) {
             log.info("当前任务执行了{}", processTaskEvent);
             FileApprove fa = baseMapper.selectById(Long.valueOf(processTaskEvent.getBusinessKey()));

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java

@@ -147,7 +147,8 @@ public class TestLeaveServiceImpl implements ITestLeaveService {
     @EventListener(condition = "#processTaskEvent.key.startsWith('leave')")
     public void processTaskHandler(ProcessTaskEvent processTaskEvent) {
         // 所有demo案例的申请人节点id
-        String[] ids = workflowService.getTaskDefinitionKeyListByBusinessKey(processTaskEvent.getBusinessKey());
+        String[] ids = {"Activity_14633hx", "Activity_19b1i4j", "Activity_0uscrk3",
+            "Activity_0uscrk3", "Activity_0x6b71j", "Activity_0zy3g6j", "Activity_06a55t0"};
         if (StringUtils.equalsAny(processTaskEvent.getTaskDefinitionKey(), ids)) {
             log.info("当前任务执行了{}", processTaskEvent);
             TestLeave testLeave = baseMapper.selectById(Long.valueOf(processTaskEvent.getBusinessKey()));