corpid

src/main/java/org/rcisoft/sys/user/controller/SysUserController.java

@@ -51,7 +51,8 @@ public class SysUserController extends PaginationController<SysUser> {
             @ApiImplicitParam(name = "roleName", value = "用户角色", required = false, dataType = "varchar")})
     @GetMapping(value = "/queryUsers")
     public GridModel queryUsers(CurUser curUser, @Valid QuerySysUserDTO dto, BindingResult br) {
-        userServiceImpl.queryUsersByPagination(getPaginationUtility(), dto,curUser.getCorpId());
+        dto.setCorpId(curUser.getCorpId());
+        userServiceImpl.queryUsersByPagination(getPaginationUtility(), dto);
         GridModel gridModel = getGridModelResponse();
         return gridModel;
     }

src/main/java/org/rcisoft/sys/user/dao/SysUserMapper.java

@@ -28,7 +28,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
             "<if test=\"roleName!=null and roleName != ''\"> and sr.role_name = #{roleName}</if>" +
             "<if test=\"flag!=null and flag != ''\"> and su.flag = #{flag}</if></script>")
     @ResultMap(value = "BaseResultMap")
-    List<SysUser> queryUsers(QuerySysUserDTO dto,@Param("cropId") String corpId);
+    List<SysUser> queryUsers(QuerySysUserDTO dto);
 
     @Select("<script>SELECT sr.r_name AS roleList  " +
             "FROM s_user AS su " +

src/main/java/org/rcisoft/sys/user/dto/QuerySysUserDTO.java

@@ -16,6 +16,9 @@ public class QuerySysUserDTO {
     @ApiModelProperty(value = "用户角色")
     private String roleName;
 
+    @ApiModelProperty(value = "企业id")
+    private String corpId;
+
     @ApiModelProperty(value = "部门（暂时不用）")
     private String dept;
 

src/main/java/org/rcisoft/sys/user/service/SysUserService.java

@@ -19,7 +19,7 @@ public interface SysUserService {
     String checkPassword(String userId);
 
 
-    List<SysUser> queryUsersByPagination(PageUtil pageUtil, QuerySysUserDTO dto,String cropId);
+    List<SysUser> queryUsersByPagination(PageUtil pageUtil, QuerySysUserDTO dto);
 
     int removeUser(String id);
 

src/main/java/org/rcisoft/sys/user/service/impl/SysUserServiceImpl.java

@@ -40,8 +40,8 @@ public class SysUserServiceImpl implements SysUserService {
     private Global global;
 
     @Override
-    public List<SysUser> queryUsersByPagination(PageUtil pageUtil, QuerySysUserDTO dto,String corpId) {
-        return sysUserMapper.queryUsers(dto,corpId);
+    public List<SysUser> queryUsersByPagination(PageUtil pageUtil, QuerySysUserDTO dto) {
+        return sysUserMapper.queryUsers(dto);
     }
 
     @Override