用户列表查询修改

distributed-print/src/main/java/com/qmth/distributed/print/api/SysUserController.java

@@ -64,7 +64,8 @@ public class SysUserController {
 
     /**
      * 用户列表查询
-     * @param userInfo 用户信息（账号/姓名/手机号）
+     *
+     * @param userInfo   用户信息（账号/姓名/手机号）
      * @param roleId
      * @param orgId
      * @param enable
@@ -80,7 +81,7 @@ public class SysUserController {
                        @RequestParam(value = "enable", required = false) Boolean enable,
                        @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
                        @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
-        return ResultUtil.ok(sysUserService.list(userInfo, SystemConstant.convertIdToLong(orgId), roleId, enable, pageNumber, pageSize));
+        return ResultUtil.ok(sysUserService.list(userInfo, SystemConstant.convertIdToLong(orgId), roleId, enable, null, null, pageNumber, pageSize));
     }
 
     /**

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/result/BasicStudentResult.java

@@ -24,10 +24,6 @@ public class BasicStudentResult {
     @ApiModelProperty(value = "学生电话")
     private String phoneNumber;
 
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "校区id")
-    private Long campusId;
-
     @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "学院id")
     private Long collegeId;
@@ -91,14 +87,6 @@ public class BasicStudentResult {
         this.phoneNumber = phoneNumber;
     }
 
-    public Long getCampusId() {
-        return campusId;
-    }
-
-    public void setCampusId(Long campusId) {
-        this.campusId = campusId;
-    }
-
     public Long getCollegeId() {
         return collegeId;
     }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/mapper/SysUserMapper.java

@@ -26,7 +26,7 @@ import java.util.Set;
  */
 public interface SysUserMapper extends BaseMapper<SysUser> {
 
-    IPage<UserDto> listPage(Page<UserDto> page, @Param("schoolId") Long schoolId, @Param("userInfo") String userInfo, @Param("orgId") Long orgId, @Param("roleId") String roleId, @Param("enable") Boolean enable);
+    IPage<UserDto> listPage(Page<UserDto> page, @Param("schoolId") Long schoolId, @Param("userInfo") String userInfo, @Param("orgId") Long orgId, @Param("roleId") String roleId, @Param("enable") Boolean enable, @Param("loginName") String loginName, @Param("realName") String realName);
 
     List<BlurryUserDto> listUser(@Param("schoolId") Long schoolId, @Param("type") String type, @Param("courseCode") String courseCode, @Param("param") String param, @Param("orgIds") Set<Long> orgIds);
 

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/SysUserService.java

@@ -32,6 +32,7 @@ import java.util.Set;
  */
 public interface SysUserService extends IService<SysUser> {
 
+
     /**
      * 查询用户列表
      *
@@ -39,11 +40,13 @@ public interface SysUserService extends IService<SysUser> {
      * @param orgId      机构id
      * @param roleId     角色id
      * @param enable     启用禁用状态
+     * @param loginName  账号
+     * @param realName   真实姓名
      * @param pageNumber 分页页数
      * @param pageSize   分页容量
      * @return 用户集合
      */
-    IPage<UserDto> list(String userInfo, Long orgId, String roleId, Boolean enable, Integer pageNumber, Integer pageSize);
+    IPage<UserDto> list(String userInfo, Long orgId, String roleId, Boolean enable, String loginName, String realName, Integer pageNumber, Integer pageSize);
 
     Long saveUser(UserSaveParams userSaveParams) throws IllegalAccessException;
 

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/SysUserServiceImpl.java

@@ -98,11 +98,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     SysRoleGroupMemberService sysRoleGroupMemberService;
 
     @Override
-    public IPage<UserDto> list(String userInfo, Long orgId, String roleId, Boolean enable, Integer pageNumber, Integer pageSize) {
+    public IPage<UserDto> list(String userInfo, Long orgId, String roleId, Boolean enable, String loginName, String realName, Integer pageNumber, Integer pageSize) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
 
         Page<UserDto> page = new Page<>(pageNumber, pageSize);
-        IPage<UserDto> userDtoIPage = this.baseMapper.listPage(page, schoolId, SystemConstant.translateSpecificSign(userInfo),orgId, roleId, enable);
+        IPage<UserDto> userDtoIPage = this.baseMapper.listPage(page, schoolId, SystemConstant.translateSpecificSign(userInfo), orgId, roleId, enable, SystemConstant.translateSpecificSign(loginName), SystemConstant.translateSpecificSign(realName));
         if (userDtoIPage.getRecords().size() > 0) {
             userDtoIPage.getRecords().forEach(m -> {
                 //角色
@@ -807,29 +807,29 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     }
 
     @Override
-    public SpecialPrivilegeEnum findUserSpecialPrivilegeByUserId(Long userId,Long schoolId) {
+    public SpecialPrivilegeEnum findUserSpecialPrivilegeByUserId(Long userId, Long schoolId) {
 
 
         // 知学知考评卷员-科组长角色
-        boolean markerRole = this.includeSysRole(userId,RoleTypeEnum.MARKER);
-        boolean leaderRole = this.includeSysRole(userId,RoleTypeEnum.MARKER_LEADER);
+        boolean markerRole = this.includeSysRole(userId, RoleTypeEnum.MARKER);
+        boolean leaderRole = this.includeSysRole(userId, RoleTypeEnum.MARKER_LEADER);
 
         // 记录的云阅卷应该的状态（云阅卷自己不改）
         boolean cloudMarker = true;
         boolean cloudLeader = true;
-        List<CloudUserPushStatusDto> userPushDtoList = this.baseMapper.findCloudUserPushStatus(userId,schoolId);
-        if (userPushDtoList != null){
-            if (userPushDtoList.size() > 1){
+        List<CloudUserPushStatusDto> userPushDtoList = this.baseMapper.findCloudUserPushStatus(userId, schoolId);
+        if (userPushDtoList != null) {
+            if (userPushDtoList.size() > 1) {
                 String userName = this.getById(userId).getLoginName();
                 throw ExceptionResultEnum.ERROR.exception("用户【" + userName + "】存在多条推送状态记录异常");
             }
-            if (userPushDtoList.size() == 1){
+            if (userPushDtoList.size() == 1) {
                 CloudUserPushStatusDto pushStatusDto = userPushDtoList.get(0);
-                if (!UserPushResultEnum.BIND_SUCCESS.equals(UserPushResultEnum.valueOf(pushStatusDto.getMarkerStatus()))){
+                if (!UserPushResultEnum.BIND_SUCCESS.equals(UserPushResultEnum.valueOf(pushStatusDto.getMarkerStatus()))) {
                     // 有推送记录但推送状态不是评卷员绑定成功
                     cloudMarker = false;
                 }
-                if (!UserPushResultEnum.BIND_SUCCESS.equals(UserPushResultEnum.valueOf(pushStatusDto.getMarkerLeaderStatus()))){
+                if (!UserPushResultEnum.BIND_SUCCESS.equals(UserPushResultEnum.valueOf(pushStatusDto.getMarkerLeaderStatus()))) {
                     // 有推送记录但推送状态不是科组长绑定成功
                     cloudLeader = false;
                 }
@@ -839,13 +839,13 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         boolean leader = leaderRole && cloudLeader;
 
         SpecialPrivilegeEnum result;
-        if (marker && leader){
+        if (marker && leader) {
             result = SpecialPrivilegeEnum.COMPOSITE;
-        }else if (marker){
+        } else if (marker) {
             result = SpecialPrivilegeEnum.MARKER;
-        }else if (leader){
+        } else if (leader) {
             result = SpecialPrivilegeEnum.SUBJECT_HEADER;
-        }else {
+        } else {
             result = SpecialPrivilegeEnum.UNIDENTIFIED;
         }
         return result;

teachcloud-common/src/main/resources/mapper/SysUserMapper.xml

@@ -71,6 +71,12 @@
             <if test="enable != null">
                 and a.enable = #{enable}
             </if>
+            <if test="loginName != null and loginName != ''">
+                and a.login_name like concat('%', #{loginName} , '%')
+            </if>
+            <if test="realName != null and realName != ''">
+                and a.real_name like concat('%', #{realName} , '%')
+            </if>
         </where>
         order by a.create_time desc
     </select>

teachcloud-report/src/main/java/com/qmth/teachcloud/report/api/SysUserController.java

@@ -59,7 +59,7 @@ public class SysUserController {
                        @RequestParam(value = "realName", required = false) String realName,
                        @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
                        @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
-        return ResultUtil.ok(sysUserService.list(loginName, roleId, enable, realName, pageNumber, pageSize));
+        return ResultUtil.ok(sysUserService.list(null, null, roleId, enable, loginName, realName, pageNumber, pageSize));
     }
 
     /**