From 6195b771077bf2ac43eb9562f33128d678dae656 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期一, 01 七月 2024 22:03:05 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java |  103 +++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 98 insertions(+), 5 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 6f30772..13318fe 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
@@ -1,9 +1,17 @@
 package com.ruoyi.system.service.impl;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
+import javax.annotation.Resource;
 import javax.validation.Validator;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.domain.ZInfoUser;
+import com.ruoyi.service.ZInfoUserService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,8 +44,7 @@
  * @author ruoyi
  */
 @Service
-public class SysUserServiceImpl implements ISysUserService
-{
+public class SysUserServiceImpl implements ISysUserService {
     private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class);
 
     @Autowired
@@ -60,6 +67,19 @@
 
     @Autowired
     protected Validator validator;
+
+    @Resource
+    private ZInfoUserService zInfoUserService;
+
+    @Override
+    public List<String> findUserNames(Long[] 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;
+    }
 
     /**
      * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ鐢ㄦ埛鍒楄〃
@@ -262,6 +282,8 @@
         insertUserPost(user);
         // 鏂板鐢ㄦ埛涓庤鑹茬鐞�
         insertUserRole(user);
+
+
         return rows;
     }
 
@@ -296,6 +318,9 @@
         userPostMapper.deleteUserPostByUserId(userId);
         // 鏂板鐢ㄦ埛涓庡矖浣嶇鐞�
         insertUserPost(user);
+
+        //鏇存柊鐢ㄦ埛淇℃伅琛�
+
         return userMapper.updateUser(user);
     }
 
@@ -382,6 +407,7 @@
      */
     public void insertUserRole(SysUser user)
     {
+
         this.insertUserRole(user.getUserId(), user.getRoleIds());
     }
 
@@ -467,7 +493,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));
+
     }
 
     /**
@@ -540,4 +588,49 @@
         }
         return successMsg.toString();
     }
+
+    @Override
+    public boolean saveBatch(Collection<SysUser> entityList, int batchSize) {
+        return false;
+    }
+
+    @Override
+    public boolean saveOrUpdateBatch(Collection<SysUser> entityList, int batchSize) {
+        return false;
+    }
+
+    @Override
+    public boolean updateBatchById(Collection<SysUser> entityList, int batchSize) {
+        return false;
+    }
+
+    @Override
+    public boolean saveOrUpdate(SysUser entity) {
+        return false;
+    }
+
+    @Override
+    public SysUser getOne(Wrapper<SysUser> queryWrapper, boolean throwEx) {
+        return null;
+    }
+
+    @Override
+    public Map<String, Object> getMap(Wrapper<SysUser> queryWrapper) {
+        return null;
+    }
+
+    @Override
+    public <V> V getObj(Wrapper<SysUser> queryWrapper, Function<? super Object, V> mapper) {
+        return null;
+    }
+
+    @Override
+    public BaseMapper<SysUser> getBaseMapper() {
+        return null;
+    }
+
+    @Override
+    public Class<SysUser> getEntityClass() {
+        return null;
+    }
 }

--
Gitblit v1.9.1