From 6ab20c7baabb32cc276ecf89f5f5157d356bfc24 Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Wed, 28 Aug 2024 22:53:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=A8=E6=88=B7=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3=EF=BC=9A=E5=85=88=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E7=99=BB=E5=BD=95=EF=BC=8C=E7=84=B6=E5=90=8E?=
 =?UTF-8?q?=E6=89=8D=E8=83=BD=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jsh/erp/controller/UserController.java    |  4 +-
 .../com/jsh/erp/service/user/UserService.java | 59 +++++++++++--------
 2 files changed, 36 insertions(+), 27 deletions(-)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/UserController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/UserController.java
index 019a4972..90054ff3 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/controller/UserController.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/UserController.java
@@ -219,7 +219,7 @@ public class UserController {
     public JSONArray getUserList(HttpServletRequest request)throws Exception {
         JSONArray dataArray = new JSONArray();
         try {
-            List<User> dataList = userService.getUser();
+            List<User> dataList = userService.getUser(request);
             if (null != dataList) {
                 for (User user : dataList) {
                     JSONObject item = new JSONObject();
@@ -476,7 +476,7 @@ public class UserController {
             Long userId = Long.parseLong(redisService.getObjectFromSessionByKey(request,"userId").toString());
             User user = userService.getUser(userId);
             //获取当前用户数
-            int userCurrentNum = userService.getUser().size();
+            int userCurrentNum = userService.getUser(request).size();
             Tenant tenant = tenantService.getTenantByTenantId(user.getTenantId());
             if(tenant.getExpireTime()!=null && tenant.getExpireTime().getTime()<System.currentTimeMillis()){
                 //租户已经过期，移除token
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java
index 03af2e59..57d93e8f 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java
@@ -96,12 +96,16 @@ public class UserService {
         return list;
     }
 
-    public List<User> getUser()throws Exception {
-        UserExample example = new UserExample();
-        example.createCriteria().andStatusEqualTo(BusinessConstants.USER_STATUS_NORMAL);
+    public List<User> getUser(HttpServletRequest request) throws Exception {
         List<User> list=null;
         try{
-            list=userMapper.selectByExample(example);
+            //先校验是否登录，然后才能查询用户数据
+            Long userId = this.getUserId(request);
+            if(userId!=null) {
+                UserExample example = new UserExample();
+                example.createCriteria().andStatusEqualTo(BusinessConstants.USER_STATUS_NORMAL);
+                list = userMapper.selectByExample(example);
+            }
         }catch(Exception e){
             JshException.readFail(logger, e);
         }
@@ -110,28 +114,33 @@ public class UserService {
 
     public List<UserEx> select(String userName, String loginName, int offset, int rows)throws Exception {
         List<UserEx> list=null;
-        try{
-            list=userMapperEx.selectByConditionUser(userName, loginName, offset, rows);
-            for(UserEx ue: list){
-                String userType = "";
-                if (ue.getId().equals(ue.getTenantId())) {
-                    userType = "租户";
-                } else if(ue.getTenantId() == null){
-                    userType = "超管";
-                } else {
-                    userType = "普通";
+        try {
+            //先校验是否登录，然后才能查询用户数据
+            HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
+            Long userId = this.getUserId(request);
+            if(userId!=null) {
+                list = userMapperEx.selectByConditionUser(userName, loginName, offset, rows);
+                for (UserEx ue : list) {
+                    String userType = "";
+                    if (ue.getId().equals(ue.getTenantId())) {
+                        userType = "租户";
+                    } else if (ue.getTenantId() == null) {
+                        userType = "超管";
+                    } else {
+                        userType = "普通";
+                    }
+                    ue.setUserType(userType);
+                    //是否经理
+                    String leaderFlagStr = "";
+                    if ("1".equals(ue.getLeaderFlag())) {
+                        leaderFlagStr = "是";
+                    } else {
+                        leaderFlagStr = "否";
+                    }
+                    ue.setLeaderFlagStr(leaderFlagStr);
                 }
-                ue.setUserType(userType);
-                //是否经理
-                String leaderFlagStr = "";
-                if("1".equals(ue.getLeaderFlag())) {
-                    leaderFlagStr = "是";
-                } else {
-                    leaderFlagStr = "否";
-                }
-                ue.setLeaderFlagStr(leaderFlagStr);
             }
-        }catch(Exception e){
+        } catch(Exception e){
             JshException.readFail(logger, e);
         }
         return list;
@@ -875,7 +884,7 @@ public class UserService {
         //选中的用户的数量
         int selectUserSize = list.size();
         //查询启用状态的用户的数量
-        int enableUserSize = getUser().size();
+        int enableUserSize = getUser(request).size();
         User userInfo = userService.getCurrentUser();
         Tenant tenant = tenantService.getTenantByTenantId(userInfo.getTenantId());
         if(tenant!=null) {