From 05ffa1a7f490e1e81d6fbf1ee948db50b1fff6fc Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 14 二月 2023 16:02:52 +0800
Subject: [PATCH] 修改depcode、dircode值

---
 src/main/java/com/lf/server/service/sys/UserService.java |   58 +++++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/lf/server/service/sys/UserService.java b/src/main/java/com/lf/server/service/sys/UserService.java
index f9bb60e..0b1a135 100644
--- a/src/main/java/com/lf/server/service/sys/UserService.java
+++ b/src/main/java/com/lf/server/service/sys/UserService.java
@@ -1,11 +1,14 @@
 package com.lf.server.service.sys;
 
+import com.lf.server.entity.sys.RoleEntity;
 import com.lf.server.entity.sys.UserEntity;
 import com.lf.server.helper.Md5Helper;
 import com.lf.server.helper.RsaHelper;
 import com.lf.server.helper.StringHelper;
 import com.lf.server.mapper.sys.UserMapper;
 import com.lf.server.service.all.RedisService;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -31,11 +34,14 @@
     @Autowired
     TokenService tokenService;
 
-    @Override
-    public Integer selectCount(String uname) {
-        uname = StringHelper.getLikeStr(uname);
+    private final static Log log = LogFactory.getLog(UserService.class);
 
-        return userMapper.selectCount(uname);
+    @Override
+    public Integer selectCount(String uname, String depcode) {
+        uname = StringHelper.getLikeStr(uname);
+        depcode = StringHelper.getLeftLike(depcode);
+
+        return userMapper.selectCount(uname, depcode);
     }
 
     @Override
@@ -54,10 +60,11 @@
     }
 
     @Override
-    public List<UserEntity> selectByPage(String uname, Integer limit, Integer offset) {
+    public List<UserEntity> selectByPage(String uname, String depcode, Integer limit, Integer offset) {
         uname = StringHelper.getLikeStr(uname);
+        depcode = StringHelper.getLeftLike(depcode);
 
-        return userMapper.selectByPage(uname, limit, offset);
+        return userMapper.selectByPage(uname, depcode, limit, offset);
     }
 
     @Override
@@ -68,6 +75,21 @@
     @Override
     public Integer selectForIsAdmin(Integer id) {
         return userMapper.selectForIsAdmin(id);
+    }
+
+    @Override
+    public List<UserEntity> selectAdminUsers(Integer type) {
+        return userMapper.selectAdminUsers(type);
+    }
+
+    @Override
+    public List<RoleEntity> selectRoleByUserId(Integer id) {
+        return userMapper.selectRoleByUserId(id);
+    }
+
+    @Override
+    public List<UserEntity> selectUserByRoleId(Integer roleId) {
+        return userMapper.selectUserByRoleId(roleId);
     }
 
     @Override
@@ -91,22 +113,24 @@
     }
 
     @Override
-    public Integer updateUsers(UserEntity userEntity) {
-        return userMapper.updateUsers(userEntity);
+    public Integer updateUser(UserEntity userEntity) {
+        return userMapper.updateUser(userEntity);
     }
 
     @Override
-    public Integer selectCountForRole(String uname, Integer roleid, Integer depid) {
+    public Integer selectCountForRole(String uname, Integer roleid, String depcode) {
         uname = StringHelper.getLikeStr(uname);
+        depcode = StringHelper.getLeftLike(depcode);
 
-        return userMapper.selectCountForRole(uname, roleid, depid);
+        return userMapper.selectCountForRole(uname, roleid, depcode);
     }
 
     @Override
-    public List<UserEntity> selectByPageForRole(String uname, Integer roleid, Integer depid, Integer limit, Integer offset) {
+    public List<UserEntity> selectByPageForRole(String uname, Integer roleid, String depcode, Integer limit, Integer offset) {
         uname = StringHelper.getLikeStr(uname);
+        depcode = StringHelper.getLeftLike(depcode);
 
-        return userMapper.selectByPageForRole(uname, roleid, depid, limit, offset);
+        return userMapper.selectByPageForRole(uname, roleid, depcode, limit, offset);
     }
 
     @Override
@@ -154,6 +178,7 @@
 
             return null;
         } catch (Exception ex) {
+            log.error(ex.getMessage(), ex);
             return "瑙ｅ瘑澶辫触";
         }
     }
@@ -172,7 +197,7 @@
             // 瑙ｅ瘑
             String uid = RsaHelper.decrypt(entity.getUid());
             /*String pwd = RsaHelper.decrypt(entity.getPwd());
-            if (!StringHelper.checkPwdValid(pwd)) {
+            if (!StringHelper.isPwdValid(pwd)) {
                 return "瀵嗙爜涓嶇鍚堣姹�";
             }
 
@@ -182,6 +207,7 @@
 
             return null;
         } catch (Exception ex) {
+            log.error(ex.getMessage(), ex);
             return "瑙ｅ瘑澶辫触";
         }
     }
@@ -211,7 +237,7 @@
                 tokenService.setPwdErrCache(ue);
                 return "鏃у瘑鐮佷笉姝ｇ‘";
             }
-            if (!StringHelper.checkPwdValid(salt)) {
+            if (StringHelper.isPwdInvalid(salt)) {
                 return "瀵嗙爜涓嶇鍚堣姹�";
             }
 
@@ -222,6 +248,7 @@
 
             return null;
         } catch (Exception ex) {
+            log.error(ex.getMessage(), ex);
             return "瑙ｅ瘑澶辫触";
         }
     }
@@ -260,7 +287,7 @@
 
         try {
             String pwd = RsaHelper.decrypt(newPwd);
-            if (!StringHelper.checkPwdValid(pwd)) {
+            if (StringHelper.isPwdInvalid(pwd)) {
                 return "瀵嗙爜涓嶇鍚堣姹�";
             }
 
@@ -269,6 +296,7 @@
 
             return null;
         } catch (Exception ex) {
+            log.error(ex.getMessage(), ex);
             return "瑙ｅ瘑澶辫触";
         }
     }

--
Gitblit v1.9.3