From 101192fd84bb38911ea7bc84c21cfe2b9ba378c7 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期二, 25 六月 2024 14:25:30 +0800
Subject: [PATCH] 审批修改

---
 project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java
index 3cd231e..2f21147 100644
--- a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java
+++ b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java
@@ -124,7 +124,7 @@
     @Override
     public List<EnforceOrderVo> queryCheckList(EnforceOrderQueryBo bo)
     {
-        SysUser loginUser = SecurityUtils.getLoginUser().getUser();
+        SysUser loginUser = userService.selectUserById(SecurityUtils.getUserId());
         bo.setCheckIds(loginUser.getPhonenumber());
 //        List<Long> deptIds = deptService.getApplyDeptIdsByLoginUserId(loginUser.getUserId());
 //        if (StringUtils.isNotEmpty(deptIds)){
@@ -315,7 +315,7 @@
             throw new BaseException("鎵ф硶鍗曞凡纭鎵ф硶锛�");
         }
         order.setOrderStatus(3);
-        SysUser user = SecurityUtils.getLoginUser().getUser();
+        SysUser user = userService.selectUserById(SecurityUtils.getUserId());
         order.setExecuteId(user.getUserId());
         order.setExecuteUser(user.getNickName());
         order.setExecutePhone(user.getPhonenumber());
@@ -487,13 +487,13 @@
         if (checkLevel==3){
             return null;
         }
-        checkLevel++;
         String checkKey = "check_enforce_";
         List<String> phones = userService.getPhonesByRoleKey(checkKey + checkLevel, deptId);
         if (StringUtils.isNotEmpty(phones)){
             phones.add(0,checkLevel.toString());
             return phones;
         }
+        checkLevel ++;
         return getCheckPhonesSimple(checkLevel, deptId);
     }
 

--
Gitblit v1.9.1