From c23b3bdff7dbaa6a7ef817dc74a5636944d6a3d0 Mon Sep 17 00:00:00 2001
From: hanrenchun <hanrenchun>
Date: Tue, 10 Jun 2025 09:48:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ApprovalProcessController.java | 41 +++++++++++++++----
 1 file changed, 33 insertions(+), 8 deletions(-)

diff --git a/gather-app/src/main/java/com/ruoyi/business/controller/ApprovalProcessController.java b/gather-app/src/main/java/com/ruoyi/business/controller/ApprovalProcessController.java
index b1f5be6..63c2954 100644
--- a/gather-app/src/main/java/com/ruoyi/business/controller/ApprovalProcessController.java
+++ b/gather-app/src/main/java/com/ruoyi/business/controller/ApprovalProcessController.java
@@ -3,6 +3,7 @@ package com.ruoyi.business.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.TreeSelect;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.database.domain.*;
@@ -70,7 +71,7 @@ public class ApprovalProcessController extends BaseController {
                 List<gwglLog> list1 = gwglLogService.lambdaQuery()
                         .eq(gwglLog::getUuid, process.getUuid())
                         .orderByAsc(gwglLog::getCreateTime).list();
-                if (list1 != null  && !list1.isEmpty()) {
+                if (list1 != null && !list1.isEmpty()) {
                     for (gwglLog gwglLog : list1) {
                         if ((gwglLog.getCheckUserId() != null && gwglLog.getCheckUserId().equals(getUserId().toString()))
                                 || (gwglLog.getChecker() != null && gwglLog.getChecker().equals(getNickname()))) {
@@ -85,12 +86,11 @@ public class ApprovalProcessController extends BaseController {
                 } else {
                     continue;
                 }
-            }
-            else if (process.getMatterType() == 3) {
+            } else if (process.getMatterType() == 3) {
                 List<gwglLog> list1 = gwglLogService.lambdaQuery()
                         .eq(gwglLog::getApplyNo, process.getApprovalNo())
                         .orderByAsc(gwglLog::getCreateTime).list();
-                if (list1 != null  && !list1.isEmpty()) {
+                if (list1 != null && !list1.isEmpty()) {
                     for (gwglLog gwglLog : list1) {
                         if ((gwglLog.getCheckUserId() != null && gwglLog.getCheckUserId().equals(getUserId().toString()))
                                 || (gwglLog.getChecker() != null && gwglLog.getChecker().equals(getNickname()))) {
@@ -105,12 +105,11 @@ public class ApprovalProcessController extends BaseController {
                 } else {
                     continue;
                 }
-            }
-            else if (process.getMatterType() == 4) {
+            } else if (process.getMatterType() == 4) {
                 List<gwglLog> list1 = gwglLogService.lambdaQuery()
                         .eq(gwglLog::getApplyNo, process.getApprovalNo())
                         .orderByAsc(gwglLog::getCreateTime).list();
-                if (list1 != null  && !list1.isEmpty()) {
+                if (list1 != null && !list1.isEmpty()) {
                     for (gwglLog gwglLog : list1) {
                         if ((gwglLog.getCheckUserId() != null && gwglLog.getCheckUserId().equals(getUserId().toString()))
                                 || (gwglLog.getChecker() != null && gwglLog.getChecker().equals(getNickname()))) {
@@ -125,7 +124,7 @@ public class ApprovalProcessController extends BaseController {
                 } else {
                     continue;
                 }
-            }else {
+            } else {
                 continue;
             }
 //            如果创建时间为当天的时间
@@ -324,4 +323,30 @@ public class ApprovalProcessController extends BaseController {
     }
 
 
+    @ApiOperation("分管局领导列表")
+    @GetMapping("/leaderList")
+    public AjaxResult leaderList() {
+        List<TreeSelect> list = new ArrayList<>();
+        SysUser user = new SysUser();
+        user.setDeptId(131000L);
+        List<SysUser> userList = sysUserService.selectUserList(user);
+        for (SysUser sysUser : userList) {
+            if (sysUser.getNickName().equals("刘敬平")
+                    || sysUser.getNickName().equals("周永生")
+                    || sysUser.getNickName().equals("贾副亮")
+                    || sysUser.getNickName().equals("周培基")) {
+                continue;
+            }
+            TreeSelect select = new TreeSelect();
+            select.setId(sysUser.getUserId());
+            select.setLabel(sysUser.getNickName());
+            select.setValue(sysUser.getUserId().toString());
+            select.setDictId(sysUser.getDeptId());
+            select.setDictName(sysUser.getDept().getDeptName());
+            list.add(select);
+        }
+        return AjaxResult.success(list);
+    }
+
+
 }