From c50686f775664c5a722f4b5ad7afde1e5214b14d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 05 十一月 2024 19:07:21 +0800
Subject: [PATCH] 最新版本541200007

---
 server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
index 347f4d2..bf8ef74 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
@@ -32,6 +32,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -113,8 +114,8 @@
 
     @Override
     public SystemUser findOne(SystemUser systemUser) {
-        Wrapper<SystemUser> wrapper = new QueryWrapper<>(systemUser);
-        return systemUserMapper.selectOne(wrapper);
+        QueryWrapper<SystemUser> wrapper = new QueryWrapper<SystemUser>(systemUser);
+        return systemUserMapper.selectOne(wrapper.lambda().last("limit 1"));
     }
 
     @Override
@@ -140,6 +141,15 @@
             List<Integer> collect = list.stream().map(s -> s.getId()).collect(Collectors.toList());
             pageWrap.getModel().setDepartmentIds(collect);
         }*/
+
+        //鏌ヨ鐗规畩鐨�42浜洪厤缃�
+        if(Objects.nonNull(pageWrap.getModel()) && Constants.equalsInteger(pageWrap.getModel().getQuerySpecial(),Constants.ONE)){
+            String companySpecialId = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SPECIAL_COMPANY_ID).getCode();
+            if(StringUtils.isNotBlank(companySpecialId)){
+                pageWrap.getModel().setCompanySpecialId(companySpecialId);
+            }
+        }
+
         // 鎵ц鏌ヨ
         PageHelper.startPage(pageWrap.getPage(), pageWrap.getCapacity());
         List<SystemUserListVO> userList = systemUserMapper.selectManageList(pageWrap.getModel(), pageWrap.getOrderByClause());

--
Gitblit v1.9.3