From 0862c40ce7df0124cedfc0127c53b4119d2e536c Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期三, 28 八月 2024 16:27:46 +0800
Subject: [PATCH] 修改了时间格式

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java |   59 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 52 insertions(+), 7 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 3f4c384..54c4a1c 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
@@ -60,6 +60,9 @@
     private SysUserRoleMapper userRoleMapper;
 
     @Autowired
+    private SysUserRoleMapper sysUserRoleMapper;
+
+    @Autowired
     private SysUserPostMapper userPostMapper;
 
     @Autowired
@@ -73,7 +76,9 @@
 
     @Override
     public List<String> findUserNames(Long[] ids) {
-        List<String> usNames = userMapper.findUserNames(ids);
+        List<String> usNames = userMapper.findUserNames(ids).stream().map(SysUser::getUserName).collect(Collectors.toList());
+                //.stream().map(SysUser::getUserName).collect(Collectors.toList());;
+        System.out.println("99999999999900000000000");
         System.out.println(usNames);
                 //.stream().map(SysUser::getUserName).collect(Collectors.toList());
         return usNames;
@@ -252,6 +257,7 @@
     @Override
     public void checkUserDataScope(Long userId)
     {
+        //鍒ゆ柇鏄惁鏄鐞嗗憳
         if (!SysUser.isAdmin(SecurityUtils.getUserId()))
         {
             SysUser user = new SysUser();
@@ -294,7 +300,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;
     }
 
     /**
@@ -309,9 +324,9 @@
     {
         Long userId = user.getUserId();
         // 鍒犻櫎鐢ㄦ埛涓庤鑹插叧鑱�
-        userRoleMapper.deleteUserRoleByUserId(userId);
-        // 鏂板鐢ㄦ埛涓庤鑹茬鐞�
-        insertUserRole(user);
+//        userRoleMapper.deleteUserRoleByUserId(userId);
+//        // 鏂板鐢ㄦ埛涓庤鑹茬鐞�
+//        insertUserRole(user);
         // 鍒犻櫎鐢ㄦ埛涓庡矖浣嶅叧鑱�
         userPostMapper.deleteUserPostByUserId(userId);
         // 鏂板鐢ㄦ埛涓庡矖浣嶇鐞�
@@ -469,7 +484,7 @@
         userRoleMapper.deleteUserRoleByUserId(userId);
         // 鍒犻櫎鐢ㄦ埛涓庡矖浣嶈〃
         userPostMapper.deleteUserPostByUserId(userId);
-        return userMapper.deleteUserById(userId);
+        return userMapper.deleteById(userId);
     }
 
     /**
@@ -491,7 +506,29 @@
         userRoleMapper.deleteUserRole(userIds);
         // 鍒犻櫎鐢ㄦ埛涓庡矖浣嶅叧鑱�
         userPostMapper.deleteUserPost(userIds);
-        return userMapper.deleteUserByIds(userIds);
+        //鎵惧埌鐢ㄦ埛鍚�
+
+        for(long uid : userIds) {
+          //  System.out.println(name.equals(""));
+         //   System.out.println(name==null);
+
+         //   if(name!="" || name != null) {
+                ZInfoUser fs = zInfoUserService.getInfoBysysId(uid);
+
+                if(fs!=null)
+                {
+                    userMapper.deleteUserById(uid);
+                }
+                else
+                {
+                    userMapper.deleteById(uid);
+                }
+          //  }
+        }
+
+        return 1;
+//        zInfoUserService.removeByUserName( findUserNames(userIds));
+
     }
 
     /**
@@ -514,6 +551,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
@@ -526,7 +565,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)
@@ -553,6 +597,7 @@
                 log.error(msg, e);
             }
         }
+        sysUserRoleMapper.batchUserRole(roleList);
         if (failureNum > 0)
         {
             failureMsg.insert(0, "寰堟姳姝夛紝瀵煎叆澶辫触锛佸叡 " + failureNum + " 鏉℃暟鎹牸寮忎笉姝ｇ‘锛岄敊璇涓嬶細");

--
Gitblit v1.9.1