/organization/user/page 用户列表(分页) 新增用户类型字段

src/main/java/com/xjrsoft/module/organization/controller/UserController.java

@@ -156,6 +156,7 @@ public class UserController {
         if (ObjectUtil.isNotNull(dto.getDepartmentId())){//不为空联合查询
             IPage<UserPageVo> page = userService.selectJoinListPage(ConventPage.getPage(dto), UserPageVo.class,
                     MPJWrappers.<User>lambdaJoin()
+                            .disableSubLogicDel()
                             .distinct()
                             .like(StrUtil.isNotBlank(dto.getKeyword()), User::getName, dto.getKeyword())
                             .or(StrUtil.isNotBlank(dto.getKeyword()), x -> x.like(StrUtil.isNotBlank(dto.getKeyword()), User::getCode, dto.getKeyword()))
@@ -164,10 +165,13 @@ public class UserController {
                             .like(StrUtil.isNotBlank(dto.getCode()), User::getCode, dto.getCode())
                             .like(StrUtil.isNotBlank(dto.getName()), User::getName, dto.getName())
                             .like(StrUtil.isNotBlank(dto.getMobile()), User::getMobile, dto.getMobile())
+                            .eq(ObjectUtil.isNotNull(dto.getUserType()), Role::getId, dto.getUserType())
                             .orderByDesc(User::getCreateDate)
                             .select(User::getId)
                             .select(User.class, x -> VoToColumnUtil.fieldsToColumns(UserPageVo.class).contains(x.getProperty()))
-                            .leftJoin(UserDeptRelation.class, UserDeptRelation::getUserId, User::getId));
+                            .leftJoin(UserDeptRelation.class, UserDeptRelation::getUserId, User::getId)
+                            .leftJoin(UserRoleRelation.class, UserRoleRelation::getUserId, User::getId)
+                            .leftJoin(Role.class, Role::getId, UserRoleRelation::getRoleId));
 
             PageOutput<UserPageVo> pageOutput = ConventPage.getPageOutput(page);
 

src/main/java/com/xjrsoft/module/organization/dto/UserPageDto.java

@@ -28,4 +28,6 @@ public class UserPageDto extends PageInput {
 
     @Length(max = 20, message = "手机号长度不能超过20")
     private String mobile;
+
+    private Integer userType;
 }

src/main/resources/mapper/room/RoomTeacherAppointMapper.xml

@@ -34,36 +34,4 @@
         </if>
         ORDER BY t1.sort_code
     </select>
-
-    <select id="getPage" parameterType="com.xjrsoft.module.room.dto.RoomTeacherAppointPageDto" resultType="com.xjrsoft.module.room.vo.RoomTeacherAppointPageVo">
-        SELECT t1.id,t1.sort_code,t2.name AS build_name,t1.floor_number,t1.room_name,t3.name AS gender_cn,
-        (
-        SELECT GROUP_CONCAT(c2.name) FROM room_teacher_appoint c1
-        LEFT JOIN xjr_user c2 ON c1.user_id = c2.id
-        WHERE c1.delete_mark = 0 AND c1.room_id = t1.id
-        ) AS appoint_users FROM room t1
-        LEFT JOIN base_office_build t2 ON t1.office_build_id = t2.id
-        LEFT JOIN xjr_dictionary_detail t3 ON t1.gender = t3.code AND t3.item_id = 2023000000000000004
-        WHERE t1.delete_mark = 0
-        <if test="dto.officeBuildId != null">
-            and t1.office_build_id = #{dto.officeBuildId}
-        </if>
-        <if test="dto.floorNumber != null">
-            and t1.floor_number = #{dto.floorNumber}
-        </if>
-        <if test="dto.roomName != null and dto.roomName != ''">
-            and t1.room_name like concat('%', #{dto.checkInStatus},'%')
-        </if>
-        <if test="dto.gender != null and dto.gender != ''">
-            and t1.gender = #{dto.gender}
-        </if>
-        <if test="dto.userId != null">
-            and t1.id in (
-            SELECT DISTINCT c1.room_id FROM room_teacher_appoint c1
-            LEFT JOIN xjr_user c2 ON c1.user_id = c2.id
-            WHERE c1.delete_mark = 0 AND c2.id = #{dto.userId}
-            )
-        </if>
-        ORDER BY t1.sort_code
-    </select>
 </mapper>