Commit 861c3d09 authored by luzhuang's avatar luzhuang

corpid

parent 323fff11
...@@ -51,7 +51,7 @@ public class SysUserController extends PaginationController<SysUser> { ...@@ -51,7 +51,7 @@ public class SysUserController extends PaginationController<SysUser> {
@ApiImplicitParam(name = "roleName", value = "用户角色", required = false, dataType = "varchar")}) @ApiImplicitParam(name = "roleName", value = "用户角色", required = false, dataType = "varchar")})
@GetMapping(value = "/queryUsers") @GetMapping(value = "/queryUsers")
public GridModel queryUsers(CurUser curUser, @Valid QuerySysUserDTO dto, BindingResult br) { public GridModel queryUsers(CurUser curUser, @Valid QuerySysUserDTO dto, BindingResult br) {
userServiceImpl.queryUsersByPagination(getPaginationUtility(), dto); userServiceImpl.queryUsersByPagination(getPaginationUtility(), dto,curUser.getCorpId());
GridModel gridModel = getGridModelResponse(); GridModel gridModel = getGridModelResponse();
return gridModel; return gridModel;
} }
......
...@@ -21,11 +21,14 @@ public interface SysUserMapper extends BaseMapper<SysUser> { ...@@ -21,11 +21,14 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
"LEFT JOIN tm_admin_role AS sr ON sr.r_id = ru.role_id " + "LEFT JOIN tm_admin_role AS sr ON sr.r_id = ru.role_id " +
"WHERE su.del_flag = 0 " + "WHERE su.del_flag = 0 " +
"and sr.r_status != 0 " + "and sr.r_status != 0 " +
"and corp_id = #{corpId} " +
"<if test=\"name!=null and name != ''\"> and su.name like CONCAT('%',#{name},'%') </if>" + "<if test=\"name!=null and name != ''\"> and su.name like CONCAT('%',#{name},'%') </if>" +
"<if test=\"roleName!=null and roleName != ''\"> and sr.role_name = #{roleName}</if>" + "<if test=\"roleName!=null and roleName != ''\"> and sr.role_name = #{roleName}</if>" +
"<if test=\"flag!=null and flag != ''\"> and su.flag = #{flag}</if></script>") "<if test=\"flag!=null and flag != ''\"> and su.flag = #{flag}</if></script>")
@ResultMap(value = "BaseResultMap") @ResultMap(value = "BaseResultMap")
List<SysUser> queryUsers(QuerySysUserDTO dto); List<SysUser> queryUsers(QuerySysUserDTO dto,@Param("cropId") String corpId);
@Select("<script>SELECT sr.r_name AS roleList " + @Select("<script>SELECT sr.r_name AS roleList " +
"FROM s_user AS su " + "FROM s_user AS su " +
......
...@@ -19,7 +19,7 @@ public interface SysUserService { ...@@ -19,7 +19,7 @@ public interface SysUserService {
String checkPassword(String userId); String checkPassword(String userId);
List<SysUser> queryUsersByPagination(PageUtil pageUtil, QuerySysUserDTO dto); List<SysUser> queryUsersByPagination(PageUtil pageUtil, QuerySysUserDTO dto,String cropId);
int removeUser(String id); int removeUser(String id);
......
...@@ -40,8 +40,8 @@ public class SysUserServiceImpl implements SysUserService { ...@@ -40,8 +40,8 @@ public class SysUserServiceImpl implements SysUserService {
private Global global; private Global global;
@Override @Override
public List<SysUser> queryUsersByPagination(PageUtil pageUtil, QuerySysUserDTO dto) { public List<SysUser> queryUsersByPagination(PageUtil pageUtil, QuerySysUserDTO dto,String corpId) {
return sysUserMapper.queryUsers(dto); return sysUserMapper.queryUsers(dto,corpId);
} }
@Override @Override
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment