Complete team user code

This commit is contained in:
JiaJu Zhuang
2023-08-13 17:49:13 +08:00
parent eb7f96c487
commit 4a19c57b37
3 changed files with 4 additions and 4 deletions

View File

@ -52,8 +52,7 @@ public class TeamUserServiceImpl implements TeamUserService {
Page<TeamUserDO> page = new Page<>(param.getPageNo(), param.getPageSize());
page.setSearchCount(param.getEnableReturnCount());
IPage<TeamUserDO> iPage = teamUserCustomMapper.comprehensivePageQuery(page, param.getTeamId(),
param.getUserId(),
param.getTeamRoleCode());
param.getUserId(), param.getTeamRoleCode(),param.getTeamSearchKey(),param.getUserSearchKey());
List<TeamUser> list = teamUserConverter.do2dto(iPage.getRecords());

View File

@ -13,5 +13,6 @@ import org.apache.ibatis.annotations.Param;
public interface TeamUserCustomMapper extends Mapper<TeamUserDO> {
IPage<TeamUserDO> comprehensivePageQuery(IPage<TeamUserDO> page, @Param("teamId") Long teamId,
@Param("userId") Long userId, @Param("teamRoleCode") String teamRoleCode);
@Param("userId") Long userId, @Param("teamRoleCode") String teamRoleCode,
@Param("teamSearchKey") String teamSearchKey, @Param("userSearchKey") String userSearchKey);
}

View File

@ -15,7 +15,7 @@
<if test="dataSourceId != null ">
and dsa.DATA_SOURCE_ID = #{dataSourceId}
</if>
<if test="searchKey != null ">
<if test="userOrTeamSearchKey != null ">
and (t.CODE like concat('%',#{userOrTeamSearchKey},'%') or t.NAME like concat('%',#{userOrTeamSearchKey},'%') or
du.USER_NAME like concat('%',#{userOrTeamSearchKey},'%') or du.NICK_NAME like concat('%',#{userOrTeamSearchKey},'%') or
du.EMAIL like concat('%',#{userOrTeamSearchKey},'%'))