备份

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java

@@ -99,4 +99,11 @@ public interface SysUserMapper extends BaseMapperPlus<SysUserMapper, SysUser, Sy
      * @return
      */
     SysUser selectUserByIdAndNotDelFlag(Long userId);
+
+    /**
+     * 查询基本数据
+     * @return
+     */
+    List<SysUser> selectListAndNotDel();
+
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java

@@ -227,4 +227,10 @@ public interface ISysUserService {
      */
     int deleteUserByIds(Long[] userIds);
 
+    /**
+     * 查找所有没有被删除的用户的基本信息
+     * @return
+     */
+    List<SysUser> selectUserList2();
+
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -34,6 +34,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -487,6 +488,12 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
         return baseMapper.deleteBatchIds(ids);
     }
 
+    @Override
+    public List<SysUser> selectUserList2() {
+
+        return baseMapper.selectListAndNotDel();
+    }
+
     @Cacheable(cacheNames = CacheNames.SYS_USER_NAME, key = "#userId")
     @Override
     public String selectUserNameById(Long userId) {

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -50,6 +50,17 @@
         <result property="status" column="role_status"/>
     </resultMap>
 
+    <resultMap type="com.ruoyi.common.core.domain.entity.SysUser" id="ClearUser">
+        <id property="userId" column="user_id"/>
+        <result property="userName" column="user_name"/>
+        <result property="nickName" column="nick_name"/>
+        <result property="userType" column="user_type"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="idCard" column="id_card"/>
+        <result property="bankCard" column="bank_card"/>
+        <result property="laborCost" column="labor_cost"/>
+    </resultMap>
+
     <sql id="selectUserVo">
         select u.user_id,
                u.dept_id,
@@ -151,4 +162,9 @@
     </select>
 
 
+    <select id="selectListAndNotDel" resultMap="ClearUser">
+        select user_id,user_name,nick_name,labor_cost from sys_user where del_flag ='0'
+    </select>
+
+
 </mapper>