From 2f432628a460a73f830c278a7d69e8328767a7b6 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期一, 10 六月 2024 10:12:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java |   28 ++++++++++++++++++++++++++--
 1 files changed, 26 insertions(+), 2 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..e97cc14 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
@@ -73,7 +73,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;
@@ -491,7 +493,29 @@
         userRoleMapper.deleteUserRole(userIds);
         // 鍒犻櫎鐢ㄦ埛涓庡矖浣嶅叧鑱�
         userPostMapper.deleteUserPost(userIds);
-        return userMapper.deleteUserByIds(userIds);
+        //鎵惧埌鐢ㄦ埛鍚�
+        List<String> unames = findUserNames(userIds);
+        for(String name :unames) {
+          //  System.out.println(name.equals(""));
+         //   System.out.println(name==null);
+
+         //   if(name!="" || name != null) {
+                ZInfoUser fs = new ZInfoUser();
+                fs.setNickName(name);
+                List<ZInfoUser> lis = zInfoUserService.selectByCondition(fs);
+                System.out.println("902");
+
+                System.out.println(lis.size());
+                if (!name.equals("") && lis.size() > 0)
+                    userMapper.deleteUserByUserName(name);
+                else
+                    userMapper.deleteUserByName(name);
+          //  }
+        }
+
+        return 1;
+//        zInfoUserService.removeByUserName( findUserNames(userIds));
+
     }
 
     /**

--
Gitblit v1.9.1