代码优化

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/CardRuleDto.java

@@ -1,8 +1,8 @@
 package com.qmth.distributed.print.business.bean.dto;
 
 import com.qmth.distributed.print.business.entity.SysOrg;
-import com.qmth.distributed.print.common.enums.ExamNumberStyleEnum;
-import com.qmth.distributed.print.common.enums.PaperTypeEnum;
+import com.qmth.distributed.print.business.enums.ExamNumberStyleEnum;
+import com.qmth.distributed.print.business.enums.PaperTypeEnum;
 
 import java.util.List;
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/PrivilegeDto.java

@@ -1,6 +1,6 @@
 package com.qmth.distributed.print.business.bean.dto;
 
-import com.qmth.distributed.print.common.enums.PrivilegeTypeEnum;
+import com.qmth.distributed.print.business.enums.PrivilegeTypeEnum;
 
 import java.util.ArrayList;
 import java.util.List;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/TemplateDto.java

@@ -1,8 +1,8 @@
 package com.qmth.distributed.print.business.bean.dto;
 
 import com.qmth.distributed.print.business.entity.SysOrg;
-import com.qmth.distributed.print.common.enums.ClassifyEnum;
-import com.qmth.distributed.print.common.enums.TemplateTypeEnum;
+import com.qmth.distributed.print.business.enums.ClassifyEnum;
+import com.qmth.distributed.print.business.enums.TemplateTypeEnum;
 
 import java.util.List;
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/BasicCardRule.java

@@ -3,8 +3,8 @@ package com.qmth.distributed.print.business.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.qmth.distributed.print.business.base.BaseEntity;
-import com.qmth.distributed.print.common.enums.ExamNumberStyleEnum;
-import com.qmth.distributed.print.common.enums.PaperTypeEnum;
+import com.qmth.distributed.print.business.enums.ExamNumberStyleEnum;
+import com.qmth.distributed.print.business.enums.PaperTypeEnum;
 
 import java.io.Serializable;
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/BasicExamRule.java

@@ -3,7 +3,7 @@ package com.qmth.distributed.print.business.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.qmth.distributed.print.business.base.BaseEntity;
-import com.qmth.distributed.print.common.enums.PrintMethodEnum;
+import com.qmth.distributed.print.business.enums.PrintMethodEnum;
 
 import java.io.Serializable;
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/BasicTemplate.java

@@ -3,8 +3,8 @@ package com.qmth.distributed.print.business.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.qmth.distributed.print.business.base.BaseEntity;
-import com.qmth.distributed.print.common.enums.ClassifyEnum;
-import com.qmth.distributed.print.common.enums.TemplateTypeEnum;
+import com.qmth.distributed.print.business.enums.ClassifyEnum;
+import com.qmth.distributed.print.business.enums.TemplateTypeEnum;
 
 import java.io.Serializable;
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/BasicTemplateOrg.java

@@ -1,10 +1,9 @@
 package com.qmth.distributed.print.business.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.qmth.distributed.print.business.base.BaseEntity;
-import com.qmth.distributed.print.common.enums.TemplateTypeEnum;
+import com.qmth.distributed.print.business.enums.TemplateTypeEnum;
 
 import java.io.Serializable;
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/ExamTask.java

@@ -3,7 +3,7 @@ package com.qmth.distributed.print.business.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.qmth.distributed.print.business.base.BaseEntity;
-import com.qmth.distributed.print.common.enums.ExamStatusEnum;
+import com.qmth.distributed.print.business.enums.ExamStatusEnum;
 
 import java.io.Serializable;
 import java.util.Date;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/SysPrivilege.java

@@ -3,7 +3,7 @@ package com.qmth.distributed.print.business.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.qmth.distributed.print.business.base.BaseEntity;
-import com.qmth.distributed.print.common.enums.PrivilegeTypeEnum;
+import com.qmth.distributed.print.business.enums.PrivilegeTypeEnum;
 
 import java.io.Serializable;
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/SysRole.java

@@ -3,7 +3,7 @@ package com.qmth.distributed.print.business.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.qmth.distributed.print.business.base.BaseEntity;
-import com.qmth.distributed.print.common.enums.RoleTypeEnum;
+import com.qmth.distributed.print.business.enums.RoleTypeEnum;
 
 import java.io.Serializable;
 

distributed-print-common/src/main/java/com/qmth/distributed/print/common/enums/BackupMethodEnum.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/BackupMethodEnum.java

@@ -1,6 +1,6 @@
-package com.qmth.distributed.print.common.enums;
+package com.qmth.distributed.print.business.enums;
 
-import com.qmth.distributed.print.common.enums.result.EnumResult;
+import com.qmth.distributed.print.business.enums.result.EnumResult;
 
 import java.util.ArrayList;
 import java.util.List;

distributed-print-common/src/main/java/com/qmth/distributed/print/common/enums/CardRequiredFieldsEnum.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/CardRequiredFieldsEnum.java

@@ -1,6 +1,7 @@
-package com.qmth.distributed.print.common.enums;
+package com.qmth.distributed.print.business.enums;
 
-import com.qmth.distributed.print.common.enums.result.EnumResult;
+import com.qmth.distributed.print.business.enums.result.EnumResult;
+import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
 
 import java.util.ArrayList;
 import java.util.List;

distributed-print-common/src/main/java/com/qmth/distributed/print/common/enums/ClassifyEnum.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/ClassifyEnum.java

@@ -1,6 +1,6 @@
-package com.qmth.distributed.print.common.enums;
+package com.qmth.distributed.print.business.enums;
 
-import com.qmth.distributed.print.common.enums.result.EnumResult;
+import com.qmth.distributed.print.business.enums.result.EnumResult;
 
 import java.util.ArrayList;
 import java.util.List;

distributed-print-common/src/main/java/com/qmth/distributed/print/common/enums/DrawRuleEnum.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/DrawRuleEnum.java

@@ -1,6 +1,6 @@
-package com.qmth.distributed.print.common.enums;
+package com.qmth.distributed.print.business.enums;
 
-import com.qmth.distributed.print.common.enums.result.EnumResult;
+import com.qmth.distributed.print.business.enums.result.EnumResult;
 
 import java.util.ArrayList;
 import java.util.List;

distributed-print-common/src/main/java/com/qmth/distributed/print/common/enums/EnumType.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/EnumType.java

@@ -1,4 +1,4 @@
-package com.qmth.distributed.print.common.enums;
+package com.qmth.distributed.print.business.enums;
 
 /**
  * @Date: 2021/3/29.

distributed-print-common/src/main/java/com/qmth/distributed/print/common/enums/ExamNumberStyleEnum.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/ExamNumberStyleEnum.java

@@ -1,6 +1,6 @@
-package com.qmth.distributed.print.common.enums;
+package com.qmth.distributed.print.business.enums;
 
-import com.qmth.distributed.print.common.enums.result.EnumResult;
+import com.qmth.distributed.print.business.enums.result.EnumResult;
 
 import java.util.ArrayList;
 import java.util.List;

distributed-print-common/src/main/java/com/qmth/distributed/print/common/enums/ExamStatusEnum.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/ExamStatusEnum.java

@@ -1,6 +1,6 @@
-package com.qmth.distributed.print.common.enums;
+package com.qmth.distributed.print.business.enums;
 
-import com.qmth.distributed.print.common.enums.result.EnumResult;
+import com.qmth.distributed.print.business.enums.result.EnumResult;
 
 import java.util.ArrayList;
 import java.util.List;

distributed-print-common/src/main/java/com/qmth/distributed/print/common/enums/PaperTypeEnum.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/PaperTypeEnum.java

@@ -1,6 +1,6 @@
-package com.qmth.distributed.print.common.enums;
+package com.qmth.distributed.print.business.enums;
 
-import com.qmth.distributed.print.common.enums.result.EnumResult;
+import com.qmth.distributed.print.business.enums.result.EnumResult;
 
 import java.util.ArrayList;
 import java.util.List;

distributed-print-common/src/main/java/com/qmth/distributed/print/common/enums/PrintMethodEnum.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/PrintMethodEnum.java

@@ -1,6 +1,6 @@
-package com.qmth.distributed.print.common.enums;
+package com.qmth.distributed.print.business.enums;
 
-import com.qmth.distributed.print.common.enums.result.EnumResult;
+import com.qmth.distributed.print.business.enums.result.EnumResult;
 
 import java.util.ArrayList;
 import java.util.List;

distributed-print-common/src/main/java/com/qmth/distributed/print/common/enums/PrivilegeTypeEnum.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/PrivilegeTypeEnum.java

@@ -1,6 +1,6 @@
-package com.qmth.distributed.print.common.enums;
+package com.qmth.distributed.print.business.enums;
 
-import com.qmth.distributed.print.common.enums.result.EnumResult;
+import com.qmth.distributed.print.business.enums.result.EnumResult;
 
 import java.util.ArrayList;
 import java.util.List;

distributed-print-common/src/main/java/com/qmth/distributed/print/common/enums/RequiredFieldsEnum.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/RequiredFieldsEnum.java

@@ -1,6 +1,6 @@
-package com.qmth.distributed.print.common.enums;
+package com.qmth.distributed.print.business.enums;
 
-import com.qmth.distributed.print.common.enums.result.EnumResult;
+import com.qmth.distributed.print.business.enums.result.EnumResult;
 
 import java.util.ArrayList;
 import java.util.List;

distributed-print-common/src/main/java/com/qmth/distributed/print/common/enums/ReviewStatusEnum.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/ReviewStatusEnum.java

@@ -1,6 +1,6 @@
-package com.qmth.distributed.print.common.enums;
+package com.qmth.distributed.print.business.enums;
 
-import com.qmth.distributed.print.common.enums.result.EnumResult;
+import com.qmth.distributed.print.business.enums.result.EnumResult;
 
 import java.util.ArrayList;
 import java.util.List;

distributed-print-common/src/main/java/com/qmth/distributed/print/common/enums/RoleTypeEnum.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/RoleTypeEnum.java

@@ -1,6 +1,6 @@
-package com.qmth.distributed.print.common.enums;
+package com.qmth.distributed.print.business.enums;
 
-import com.qmth.distributed.print.common.enums.result.EnumResult;
+import com.qmth.distributed.print.business.enums.result.EnumResult;
 
 import java.util.ArrayList;
 import java.util.List;

distributed-print-common/src/main/java/com/qmth/distributed/print/common/enums/Source.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/Source.java

@@ -1,4 +1,4 @@
-package com.qmth.distributed.print.common.enums;
+package com.qmth.distributed.print.business.enums;
 
 public enum Source {
 

distributed-print-common/src/main/java/com/qmth/distributed/print/common/enums/StorageLevelEnum.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/StorageLevelEnum.java

@@ -1,6 +1,6 @@
-package com.qmth.distributed.print.common.enums;
+package com.qmth.distributed.print.business.enums;
 
-import com.qmth.distributed.print.common.enums.result.EnumResult;
+import com.qmth.distributed.print.business.enums.result.EnumResult;
 
 import java.util.ArrayList;
 import java.util.List;

distributed-print-common/src/main/java/com/qmth/distributed/print/common/enums/StorageTypeEnum.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/StorageTypeEnum.java

@@ -1,6 +1,6 @@
-package com.qmth.distributed.print.common.enums;
+package com.qmth.distributed.print.business.enums;
 
-import com.qmth.distributed.print.common.enums.result.EnumResult;
+import com.qmth.distributed.print.business.enums.result.EnumResult;
 
 import java.util.ArrayList;
 import java.util.List;

distributed-print-common/src/main/java/com/qmth/distributed/print/common/enums/TemplateTypeEnum.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/TemplateTypeEnum.java

@@ -1,6 +1,6 @@
-package com.qmth.distributed.print.common.enums;
+package com.qmth.distributed.print.business.enums;
 
-import com.qmth.distributed.print.common.enums.result.EnumResult;
+import com.qmth.distributed.print.business.enums.result.EnumResult;
 
 import java.util.ArrayList;
 import java.util.List;

distributed-print-common/src/main/java/com/qmth/distributed/print/common/enums/result/EnumResult.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/result/EnumResult.java

@@ -1,4 +1,4 @@
-package com.qmth.distributed.print.common.enums.result;
+package com.qmth.distributed.print.business.enums.result;
 
 /**
  * @Date: 2021/3/23.

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/SysUserMapper.java

@@ -18,5 +18,5 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface SysUserMapper extends BaseMapper<SysUser> {
 
-    IPage<UserDto> listPage(Page<UserDto> page, @Param("param") UserParam param);
+    IPage<UserDto> listPage(Page<UserDto> page, @Param("schoolId") Long schoolId, @Param("realName") String realName, @Param("roleId") String roleId, @Param("enable") Boolean enable);
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/BasicTemplateOrgService.java

@@ -3,7 +3,7 @@ package com.qmth.distributed.print.business.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qmth.distributed.print.business.entity.BasicTemplateOrg;
 import com.qmth.distributed.print.business.entity.SysOrg;
-import com.qmth.distributed.print.common.enums.TemplateTypeEnum;
+import com.qmth.distributed.print.business.enums.TemplateTypeEnum;
 
 import java.util.List;
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/SysUserService.java

@@ -16,7 +16,7 @@ import com.qmth.distributed.print.business.entity.SysUser;
  */
 public interface SysUserService extends IService<SysUser> {
 
-    IPage<UserDto> list(UserParam param);
+    IPage<UserDto> list(Long schoolId, String realName, String roleId, Boolean enable, Integer pageNumber, Integer pageSize);
 
     boolean saveUser(SysUser user);
 
@@ -27,4 +27,5 @@ public interface SysUserService extends IService<SysUser> {
     boolean updatePassword(Long id, String oldPassword, String password);
 
     boolean bindRoles(SysUser sysUser);
+
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/BasicAttachmentServiceImpl.java

@@ -7,8 +7,8 @@ import com.qmth.distributed.print.business.entity.BasicAttachment;
 import com.qmth.distributed.print.business.mapper.BasicAttachmentMapper;
 import com.qmth.distributed.print.business.service.BasicAttachmentService;
 import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
-import com.qmth.distributed.print.common.enums.StorageLevelEnum;
-import com.qmth.distributed.print.common.enums.StorageTypeEnum;
+import com.qmth.distributed.print.business.enums.StorageLevelEnum;
+import com.qmth.distributed.print.business.enums.StorageTypeEnum;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/BasicCardRuleServiceImpl.java

@@ -14,7 +14,7 @@ import com.qmth.distributed.print.business.mapper.BasicCardRuleMapper;
 import com.qmth.distributed.print.business.service.BasicCardRuleService;
 import com.qmth.distributed.print.business.service.BasicTemplateOrgService;
 import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
-import com.qmth.distributed.print.common.enums.TemplateTypeEnum;
+import com.qmth.distributed.print.business.enums.TemplateTypeEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/BasicTemplateOrgServiceImpl.java

@@ -6,7 +6,7 @@ import com.qmth.distributed.print.business.entity.BasicTemplateOrg;
 import com.qmth.distributed.print.business.entity.SysOrg;
 import com.qmth.distributed.print.business.mapper.BasicTemplateOrgMapper;
 import com.qmth.distributed.print.business.service.BasicTemplateOrgService;
-import com.qmth.distributed.print.common.enums.TemplateTypeEnum;
+import com.qmth.distributed.print.business.enums.TemplateTypeEnum;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamTaskServiceImpl.java

@@ -16,7 +16,7 @@ import com.qmth.distributed.print.business.entity.ExamTaskTemp;
 import com.qmth.distributed.print.business.mapper.ExamTaskMapper;
 import com.qmth.distributed.print.business.service.ExamTaskService;
 import com.qmth.distributed.print.business.service.ExamTaskTempService;
-import com.qmth.distributed.print.common.enums.ExamStatusEnum;
+import com.qmth.distributed.print.business.enums.ExamStatusEnum;
 import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/SysRoleServiceImpl.java

@@ -14,7 +14,7 @@ import com.qmth.distributed.print.business.service.SysRolePrivilegeService;
 import com.qmth.distributed.print.business.service.SysRoleService;
 import com.qmth.distributed.print.business.service.SysUserRoleService;
 import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
-import com.qmth.distributed.print.common.enums.RoleTypeEnum;
+import com.qmth.distributed.print.business.enums.RoleTypeEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/SysUserServiceImpl.java

@@ -6,17 +6,15 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.distributed.print.business.bean.dto.UserDto;
-import com.qmth.distributed.print.business.bean.query.UserParam;
 import com.qmth.distributed.print.business.entity.BasicCourse;
 import com.qmth.distributed.print.business.entity.SysRole;
 import com.qmth.distributed.print.business.entity.SysUser;
 import com.qmth.distributed.print.business.entity.SysUserRole;
 import com.qmth.distributed.print.business.mapper.SysUserMapper;
 import com.qmth.distributed.print.business.service.*;
-import com.qmth.distributed.print.business.service.*;
 import com.qmth.distributed.print.business.util.security.Md5Utils;
 import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
-import com.qmth.distributed.print.common.enums.RoleTypeEnum;
+import com.qmth.distributed.print.business.enums.RoleTypeEnum;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -54,9 +52,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
 
     @Override
-    public IPage<UserDto> list(UserParam param) {
-        Page<UserDto> page = new Page<>(param.getPageNumber(), param.getPageSize());
-        IPage<UserDto> userDtoIPage = this.baseMapper.listPage(page, param);
+    public IPage<UserDto> list(Long schoolId, String realName, String roleId, Boolean enable, Integer pageNumber, Integer pageSize) {
+        Page<UserDto> page = new Page<>(pageNumber, pageSize);
+        IPage<UserDto> userDtoIPage = this.baseMapper.listPage(page, schoolId, realName, roleId, enable);
         if (userDtoIPage.getRecords().size() > 0) {
             userDtoIPage.getRecords().forEach(m -> {
                 //角色
@@ -71,6 +69,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         return userDtoIPage;
     }
 
+
     @Transactional
     @Override
     public boolean saveUser(SysUser user) {
@@ -195,4 +194,5 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         }
         return sysUserRoleService.saveBatch(list);
     }
+
 }

distributed-print-business/src/main/resources/mapper/SysUserMapper.xml

@@ -35,17 +35,17 @@
         FROM
             sys_user a
         <where>
-            <if test="param.schoolId != null and param.schoolId != ''">
-                and a.school_id = #{param.schoolId}
+            <if test="schoolId != null and schoolId != ''">
+                and a.school_id = #{schoolId}
             </if>
-            <if test="param.realName != null and param.realName != ''">
-                and a.real_name like concat('%', #{param.realName} , '%')
+            <if test="realName != null and realName != ''">
+                and a.real_name like concat('%', #{realName} , '%')
             </if>
-            <if test="param.roleId != null and param.roleId != ''">
-                and a.id in (select user_id from sys_user_role b where b.role_id = #{param.roleId})
+            <if test="roleId != null and roleId != ''">
+                and a.id in (select user_id from sys_user_role b where b.role_id = #{roleId})
             </if>
-            <if test="param.enable != null">
-                and a.enable = #{param.enable}
+            <if test="enable != null">
+                and a.enable = #{enable}
             </if>
         </where>
     </select>

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

@@ -3,11 +3,11 @@ package com.qmth.distributed.print.api;
 import com.qmth.boot.api.annotation.Aac;
 import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
+import com.qmth.distributed.print.business.enums.*;
 import com.qmth.distributed.print.common.enums.*;
-import com.qmth.distributed.print.common.enums.result.EnumResult;
+import com.qmth.distributed.print.business.enums.result.EnumResult;
 import com.qmth.distributed.print.common.util.Result;
 import com.qmth.distributed.print.common.util.ResultUtil;
-import com.qmth.distributed.print.common.enums.*;
 import io.swagger.annotations.Api;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;

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

@@ -40,15 +40,22 @@ public class SysUserController {
 
     /**
      * 查询
-     * @param param
+     * @param request
+     * @param realName
+     * @param roleId
+     * @param enable
      * @return
      */
     @ApiOperation(value = "查询")
-    @RequestMapping(value = "/list", method = RequestMethod.GET)
-    public Result list(HttpServletRequest request, UserParam param){
+    @RequestMapping(value = "/list", method = RequestMethod.POST)
+    public Result list(HttpServletRequest request,
+                       @RequestParam(value = "realName", required = false) String realName,
+                       @RequestParam(value = "roleId", required = false) String roleId,
+                       @RequestParam(value = "enable", required = false) Boolean enable,
+                       @RequestParam(value = "pageNumber", required = true) Integer pageNumber,
+                       @RequestParam(value = "pageSize", required = true) Integer pageSize){
         ApiUser apiUser = RequestUtils.getApiUser(request);
-        param.setSchoolId(apiUser.getSchoolId());
-        IPage<UserDto> userDtos = sysUserService.list(param);
+        IPage<UserDto> userDtos = sysUserService.list(apiUser.getSchoolId(), realName, roleId, enable, pageNumber, pageSize);
         return ResultUtil.ok(userDtos);
     }