From 8d21a2ee4d863a3422a1def79b9f1928c00d22aa Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期日, 22 六月 2025 23:20:27 +0800
Subject: [PATCH] 没生效 重新上传

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java |   66 ++++++++++++++++++++++++++++++---
 1 files changed, 60 insertions(+), 6 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index 13318fe..b95c2a2 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -11,7 +11,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.domain.ZInfoUser;
+import com.ruoyi.domain.ZfAncestor;
 import com.ruoyi.service.ZInfoUserService;
+import com.ruoyi.service.ZfAncestorService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -60,6 +62,9 @@
     private SysUserRoleMapper userRoleMapper;
 
     @Autowired
+    private SysUserRoleMapper sysUserRoleMapper;
+
+    @Autowired
     private SysUserPostMapper userPostMapper;
 
     @Autowired
@@ -68,6 +73,8 @@
     @Autowired
     protected Validator validator;
 
+    @Autowired
+    private ZfAncestorService zfService;
     @Resource
     private ZInfoUserService zInfoUserService;
 
@@ -92,6 +99,11 @@
     public List<SysUser> selectUserList(SysUser user)
     {
         return userMapper.selectUserList(user);
+    }
+
+    @Override
+    public List<SysUser> selectCommonUserList(SysUser user) {
+        return userMapper.selectCommonUserList(user);
     }
 
     /**
@@ -130,6 +142,11 @@
     public SysUser selectUserByUserName(String userName)
     {
         return userMapper.selectUserByUserName(userName);
+    }
+
+    @Override
+    public SysUser selectUserByNickName(String nickName) {
+        return userMapper.selectUserByNickName(nickName);
     }
 
     /**
@@ -196,6 +213,17 @@
         return UserConstants.UNIQUE;
     }
 
+    @Override
+    public boolean checkNickNameUnique(SysUser user) {
+        Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
+        SysUser info = userMapper.checkNickNameUnique(user.getNickName());
+        if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
+        {
+            return UserConstants.NOT_UNIQUE;
+        }
+        return UserConstants.UNIQUE;
+    }
+
     /**
      * 鏍¢獙鎵嬫満鍙风爜鏄惁鍞竴
      *
@@ -254,7 +282,16 @@
     @Override
     public void checkUserDataScope(Long userId)
     {
-        if (!SysUser.isAdmin(SecurityUtils.getUserId()))
+        //鍒ゆ柇鏄惁鏄鐞嗗憳
+
+        ZfAncestor zfAncestor = new ZfAncestor();
+        zfAncestor.setSysId(userId);
+        zfAncestor = zfService.selectZfAncestor(zfAncestor);
+        System.out.println("---------++++++++____________");
+        System.out.println(zfAncestor);
+        //鍒ゆ柇鏄惁鏄秴绾х鐞嗗憳
+        if(zfAncestor!=null && zfAncestor.getId()==1L && zfAncestor.getRoleId()==0L)
+//        if (!SysUser.isAdmin(SecurityUtils.getUserId()))
         {
             SysUser user = new SysUser();
             user.setUserId(userId);
@@ -296,7 +333,16 @@
     @Override
     public boolean registerUser(SysUser user)
     {
-        return userMapper.insertUser(user) > 0;
+        int satisfyCount = userMapper.insertUser(user);
+        if (satisfyCount > 0) {
+            List<SysUserRole> roleList = new ArrayList<>();
+            SysUserRole roleId = new SysUserRole();
+            roleId.setUserId(user.getUserId());
+            roleId.setRoleId(2L);
+            roleList.add(roleId);
+            sysUserRoleMapper.batchUserRole(roleList);
+        }
+        return satisfyCount > 0;
     }
 
     /**
@@ -311,9 +357,9 @@
     {
         Long userId = user.getUserId();
         // 鍒犻櫎鐢ㄦ埛涓庤鑹插叧鑱�
-        userRoleMapper.deleteUserRoleByUserId(userId);
-        // 鏂板鐢ㄦ埛涓庤鑹茬鐞�
-        insertUserRole(user);
+//        userRoleMapper.deleteUserRoleByUserId(userId);
+//        // 鏂板鐢ㄦ埛涓庤鑹茬鐞�
+//        insertUserRole(user);
         // 鍒犻櫎鐢ㄦ埛涓庡矖浣嶅叧鑱�
         userPostMapper.deleteUserPostByUserId(userId);
         // 鏂板鐢ㄦ埛涓庡矖浣嶇鐞�
@@ -471,7 +517,7 @@
         userRoleMapper.deleteUserRoleByUserId(userId);
         // 鍒犻櫎鐢ㄦ埛涓庡矖浣嶈〃
         userPostMapper.deleteUserPostByUserId(userId);
-        return userMapper.deleteUserById(userId);
+        return userMapper.deleteById(userId);
     }
 
     /**
@@ -538,6 +584,8 @@
         StringBuilder successMsg = new StringBuilder();
         StringBuilder failureMsg = new StringBuilder();
         String password = configService.selectConfigByKey("sys.user.initPassword");
+        List<SysUserRole> roleList = new ArrayList<>();
+
         for (SysUser user : userList)
         {
             try
@@ -550,7 +598,12 @@
                     user.setPassword(SecurityUtils.encryptPassword(password));
                     user.setCreateBy(operName);
                     this.insertUser(user);
+                    SysUserRole roleId = new SysUserRole();
+                    roleId.setUserId(user.getUserId());
+                    roleId.setRoleId(2L);
+                    roleList.add(roleId);
                     successNum++;
+
                     successMsg.append("<br/>" + successNum + "銆佽处鍙� " + user.getUserName() + " 瀵煎叆鎴愬姛");
                 }
                 else if (isUpdateSupport)
@@ -577,6 +630,7 @@
                 log.error(msg, e);
             }
         }
+        sysUserRoleMapper.batchUserRole(roleList);
         if (failureNum > 0)
         {
             failureMsg.insert(0, "寰堟姳姝夛紝瀵煎叆澶辫触锛佸叡 " + failureNum + " 鏉℃暟鎹牸寮忎笉姝g‘锛岄敊璇涓嬶細");

--
Gitblit v1.9.1