Merge branch 'dev-api' into dev

ruoyi-sim/src/main/java/com/ruoyi/sim/controller/TeacherController.java

@@ -51,7 +51,7 @@ public class TeacherController extends BaseController {
     @GetMapping("/list")
     @ApiOperation("[分页]查询教师列表")
     public TableDataInfo list(SysUser suQ) {
-        return getDataTable(teacherService.list(suQ));
+        return getDataTable(teacherService.list2(suQ));
     }
 
     /**

ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/TeacherService.java

@@ -4,7 +4,6 @@ import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.sim.constant.Consts;
-import com.ruoyi.sim.domain.Student;
 import com.ruoyi.sim.domain.Teacher;
 import com.ruoyi.system.mapper.*;
 import com.ruoyi.system.service.ISysConfigService;
@@ -23,7 +22,7 @@ import java.util.List;
 @Service
 public class TeacherService {
 
-    private static final Logger log = LoggerFactory.getLogger(StudentService.class);
+    private static final Logger l = LoggerFactory.getLogger(StudentService.class);
 
     @Autowired
     private SysUserMapper userMapper;
@@ -54,7 +53,7 @@ public class TeacherService {
     // @DataScope(deptAlias = "d", userAlias = "u")
     public List<SysUser> selectTeacherList() {
         SysUser su = new SysUser();
-        List<SysUser> list  = userMapper.selectUserList(su);
+        List<SysUser> list = userMapper.selectUserList(su);
         List<SysUser> list2 = new ArrayList<SysUser>();
         // todo:
         for (SysUser sysUser : list) {
@@ -76,6 +75,7 @@ public class TeacherService {
      * @return
      */
     public List<Teacher> list(SysUser suQ) {
+        l.info("suQ:{}", suQ);
         // 分页
         PageUtils.startPage();
         suQ.setRoleId(Consts.ROLE_ID_TEACHER);
@@ -89,4 +89,26 @@ public class TeacherService {
         });
         return listSt;
     }
+
+    /**
+     * [分页]查询教师列表。
+     *
+     * @param suQ
+     * @return
+     */
+    public List<Teacher> list2(SysUser suQ) {
+        l.info("suQ:{}", suQ);
+        // 分页
+        PageUtils.startPage();
+        suQ.setRoleId(Consts.ROLE_ID_TEACHER);
+        List<SysUser> listSu = sysUserService.selectAllocatedListV2(suQ);
+        List<Teacher> listSt = new ArrayList<>(listSu.size());
+        listSu.forEach(su -> {
+            Teacher t = new Teacher();
+            su.setPassword("~~~~");
+            BeanUtils.copyProperties(su, t);
+            listSt.add(t);
+        });
+        return listSt;
+    }
 }

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

@@ -1,19 +1,19 @@
 package com.ruoyi.system.mapper;
 
 import java.util.List;
+
 import org.apache.ibatis.annotations.Param;
 import com.ruoyi.common.core.domain.entity.SysUser;
 
 /**
  * 用户表 数据层
- * 
+ *
  * @author ruoyi
  */
-public interface SysUserMapper
-{
+public interface SysUserMapper {
     /**
      * 根据条件分页查询用户列表
-     * 
+     *
      * @param sysUser 用户信息
      * @return 用户信息集合信息
      */
@@ -21,15 +21,17 @@ public interface SysUserMapper
 
     /**
      * 根据条件分页查询已配用户角色列表
-     * 
+     *
      * @param user 用户信息
      * @return 用户信息集合信息
      */
     public List<SysUser> selectAllocatedList(SysUser user);
 
+    public List<SysUser> selectAllocatedListV2(SysUser user);
+
     /**
      * 根据条件分页查询未分配用户角色列表
-     * 
+     *
      * @param user 用户信息
      * @return 用户信息集合信息
      */
@@ -37,7 +39,7 @@ public interface SysUserMapper
 
     /**
      * 通过用户名查询用户
-     * 
+     *
      * @param userName 用户名
      * @return 用户对象信息
      */
@@ -45,7 +47,7 @@ public interface SysUserMapper
 
     /**
      * 通过用户ID查询用户
-     * 
+     *
      * @param userId 用户ID
      * @return 用户对象信息
      */
@@ -53,7 +55,7 @@ public interface SysUserMapper
 
     /**
      * 新增用户信息
-     * 
+     *
      * @param user 用户信息
      * @return 结果
      */
@@ -61,7 +63,7 @@ public interface SysUserMapper
 
     /**
      * 修改用户信息
-     * 
+     *
      * @param user 用户信息
      * @return 结果
      */
@@ -69,16 +71,16 @@ public interface SysUserMapper
 
     /**
      * 修改用户头像
-     * 
+     *
      * @param userName 用户名
-     * @param avatar 头像地址
+     * @param avatar   头像地址
      * @return 结果
      */
     public int updateUserAvatar(@Param("userName") String userName, @Param("avatar") String avatar);
 
     /**
      * 重置用户密码
-     * 
+     *
      * @param userName 用户名
      * @param password 密码
      * @return 结果
@@ -87,7 +89,7 @@ public interface SysUserMapper
 
     /**
      * 通过用户ID删除用户
-     * 
+     *
      * @param userId 用户ID
      * @return 结果
      */
@@ -95,7 +97,7 @@ public interface SysUserMapper
 
     /**
      * 批量删除用户信息
-     * 
+     *
      * @param userIds 需要删除的用户ID
      * @return 结果
      */
@@ -103,7 +105,7 @@ public interface SysUserMapper
 
     /**
      * 校验用户名称是否唯一
-     * 
+     *
      * @param userName 用户名称
      * @return 结果
      */

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

@@ -26,6 +26,8 @@ public interface ISysUserService
      */
     public List<SysUser> selectAllocatedList(SysUser user);
 
+    public List<SysUser> selectAllocatedListV2(SysUser user);
+
     /**
      * 根据条件分页查询未分配用户角色列表
      * 

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

@@ -75,6 +75,7 @@ public class SysUserServiceImpl implements ISysUserService
     @DataScope(deptAlias = "d", userAlias = "u")
     public List<SysUser> selectUserList(SysUser user)
     {
+        log.info("user = {}", user);
         return userMapper.selectUserList(user);
     }
 
@@ -91,6 +92,13 @@ public class SysUserServiceImpl implements ISysUserService
         return userMapper.selectAllocatedList(user);
     }
 
+    @Override
+    @DataScope(deptAlias = "d", userAlias = "u")
+    public List<SysUser> selectAllocatedListV2(SysUser user)
+    {
+        return userMapper.selectAllocatedListV2(user);
+    }
+
     /**
      * 根据条件分页查询未分配用户角色列表
      * 

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

@@ -265,4 +265,37 @@
         </foreach>
     </delete>
 
+    <select id="selectAllocatedListV2" parameterType="SysUser" resultMap="SysUserResult">
+        SELECT distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
+        FROM sys_user u
+        LEFT JOIN sys_dept d ON u.dept_id = d.dept_id
+        LEFT JOIN sys_user_role ur ON u.user_id = ur.user_id
+        LEFT JOIN sys_role r ON r.role_id = ur.role_id
+        WHERE u.del_flag = '0' AND r.role_id = #{roleId}
+        <if test="userId != null and userId != 0">
+            AND u.user_id = #{userId}
+        </if>
+        <if test="userName != null and userName != ''">
+            AND u.user_name like concat('%', #{userName}, '%')
+        </if>
+        <if test="status != null and status != ''">
+            AND u.status = #{status}
+        </if>
+        <if test="phonenumber != null and phonenumber != ''">
+            AND u.phonenumber like concat('%', #{phonenumber}, '%')
+        </if>
+        <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+            AND date_format(u.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+        </if>
+        <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+            AND date_format(u.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+        </if>
+        <if test="deptId != null and deptId != 0">
+            AND (u.dept_id = #{deptId} OR u.dept_id IN
+                                          ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId},ancestors))
+                )
+        </if>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
 </mapper>