test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(系统设置): 删除组织成员排序条件

This commit is contained in:
song-cc-rock 2023-08-28 14:12:23 +08:00 committed by fit2-zhao
parent 1403e4f72e
commit dfecb1e699
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/services/system-setting/src/main/java/io/metersphere/system/controller/SystemOrganizationController.java
View File

@ -67,8 +67,7 @@ public class SystemOrganizationController {
@Operation(summary = "获取组织成员")
@RequiresPermissions(value = {PermissionConstants.SYSTEM_ORGANIZATION_PROJECT_READ, PermissionConstants.SYSTEM_USER_READ})
public Pager<List<UserExtend>> listMember(@Validated @RequestBody OrganizationRequest request) {
Page<Object> page = PageHelper.startPage(request.getCurrent(), request.getPageSize(),
StringUtils.isNotBlank(request.getSortString()) ? request.getSortString() : "create_time desc");
Page<Object> page = PageHelper.startPage(request.getCurrent(), request.getPageSize(), true);
return PageUtils.setPageInfo(page, organizationService.getMemberListBySystem(request));
}

8
backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtOrganizationMapper.xml
View File

@ -36,10 +36,10 @@
join `user` u on urr.user_id = u.id
<where>
u.deleted = 0
<if test="request.organizationId != null">
<if test="request.organizationId != null and request.organizationId != ''">
and urr.source_id = #{request.organizationId}
</if>
<if test="request.keyword != null">
<if test="request.keyword != null and request.keyword != ''">
and u.name like concat('%', #{request.keyword},'%')
</if>
</where>
@ -56,10 +56,10 @@
from user_role_relation urr
join `user` u on urr.user_id = u.id
<where>
<if test="request.organizationId != null">
<if test="request.organizationId != null and request.organizationId != ''">
urr.source_id = #{request.organizationId}
</if>
<if test="request.keyword != null">
<if test="request.keyword != null and request.keyword != ''">
and (u.name like CONCAT('%', #{request.keyword},'%')
or u.email like CONCAT('%', #{request.keyword},'%')
or u.phone like CONCAT('%', #{request.keyword},'%'))