ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ycl-common/src/main/java/com/ycl/vo/user/UserVO.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ycl-common/src/main/resources/mapper/user/UmsAdminMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java
@@ -92,7 +92,10 @@ @ApiModelProperty(value = "是否为网格管理员:0->不是;1->是") private Integer isGrid; @ApiModelProperty(value = "角色列表") @ApiModelProperty(value = "关键字段") @TableField(exist = false) private String keyword; @ApiModelProperty(value = "部门") @TableField(exist = false) private UmsDepart depart; @ApiModelProperty(value = "角色列表") ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminMapper.java
@@ -3,7 +3,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ycl.entity.user.UmsAdmin; import com.ycl.vo.user.UserVO; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -23,6 +22,6 @@ */ List<Long> getAdminIdList(@Param("resourceId") Long resourceId); Page<UmsAdmin> selectCondPage(@Param("page") Page<UmsAdmin> page, @Param("umsAdmin") UserVO.PageUserVO pageUserVO); Page<UmsAdmin> selectCondPage(Page<UmsAdmin> page,UmsAdmin umsAdmin); } ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
@@ -359,7 +359,17 @@ if (PojoUtils.Vo.isUsefulSearchParam(pageUserVO.getUserType())) { queryWrapper.eq(UmsAdmin::getUserType, pageUserVO.getUserType()); }*/ Page<UmsAdmin> page1 = baseMapper.selectCondPage(page,pageUserVO); UmsAdmin umsAdmin = new UmsAdmin(); if (pageUserVO.getUserType()!=null) { umsAdmin.setUserType(pageUserVO.getUserType()); } if (pageUserVO.getKeyword()!=null&&!("".equals(pageUserVO.getKeyword()))) { umsAdmin.setKeyword(pageUserVO.getKeyword()); } if (pageUserVO.getJobTitle()!=null&&!("".equals(pageUserVO.getJobTitle()))) { umsAdmin.setJobTitle(pageUserVO.getJobTitle()); } Page<UmsAdmin> page1 = baseMapper.selectCondPage(page,umsAdmin); return page1; } ycl-common/src/main/java/com/ycl/vo/user/UserVO.java
@@ -20,7 +20,7 @@ @ApiModelProperty(value = "用户类型,0即为查询全部,默认0",example = "0") private byte userType; private Byte userType; @ApiModelProperty(value = "职务") private String jobTitle; ycl-common/src/main/resources/mapper/user/UmsAdminMapper.xml
@@ -77,18 +77,19 @@ LEFT JOIN ums_depart ud ON udm.depart_id = ud.id LEFT JOIN ums_admin_role_relation uarr ON ua.id = uarr.admin_id LEFT JOIN ums_role ur ON uarr.role_id = ur.id where 1=1 <if test="umsAdmin.keyword !=null and umsAdmin.keyword =''"> AND (ua.username LIKE concat('%',#{umsAdmin.keyword,jdbcType=VARCHAR},'%') or ua.nick_name LIKE concat('%',#{umsAdmin.keyword,jdbcType=VARCHAR},'%') or ua.mobile ua.nick_name LIKE concat('%',#{umsAdmin.keyword,jdbcType=VARCHAR},'%')) </if> <if test="umsAdmin.userType !=null and umsAdmin.userType >=0 "> AND ua.user_type = #{umsAdmin.userType} </if> <if test="umsAdmin.jobTitle !=null and umsAdmin.jobTitle=''"> AND ua.job_title = #{umsAdmin.jobTitle} </if> <where> <if test="umsAdmin.keyword !=null and umsAdmin.keyword !=''"> AND (ua.username LIKE concat('%',#{umsAdmin.keyword,jdbcType=VARCHAR},'%') or ua.nick_name LIKE concat('%',#{umsAdmin.keyword,jdbcType=VARCHAR},'%') or ua.mobile LIKE concat('%',#{umsAdmin.keyword,jdbcType=VARCHAR},'%')) </if> <if test="umsAdmin.userType !=null and umsAdmin.userType >=0 "> AND ua.user_type = #{umsAdmin.userType} </if> <if test="umsAdmin.jobTitle !=null and umsAdmin.keyword !=''"> AND ua.job_title = #{umsAdmin.jobTitle} </if> </where> ORDER BY ua.id DESC </select>