ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminMapper.java
@@ -25,4 +25,5 @@ Page<UmsAdmin> selectCondPage(@Param("page") Page<UmsAdmin> page, @Param("umsAdmin") UserVO.PageUserVO pageUserVO); Page<UmsAdmin> selectPageByWordKey(Page<UmsAdmin> page, @Param("keyword") String keyword); } ycl-common/src/main/java/com/ycl/service/user/UmsAdminService.java
@@ -95,7 +95,7 @@ * @param pageUserVO * @return */ IPage<UmsAdmin> pageUser(UserVO.PageUserVO pageUserVO); Page<UmsAdmin> pageUser(UserVO.PageUserVO pageUserVO); /** * 批量删除用户 ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
@@ -10,6 +10,7 @@ import com.ycl.bo.AdminUserDetails; import com.ycl.dto.UmsAdminParam; import com.ycl.dto.UpdateAdminPasswordParam; import com.ycl.entity.depart.UmsDepart; import com.ycl.entity.user.*; import com.ycl.exception.ApiException; import com.ycl.exception.Asserts; @@ -79,6 +80,8 @@ AdminMenuRelationMapper adminMenuRelationMapper; @Resource UmsMenuMapper umsMenuMapper; @Resource UmsAdminMapper umsAdminMapper; @Override public UmsAdmin getAdminByUsername(String username) { @@ -342,26 +345,11 @@ } @Override public IPage<UmsAdmin> pageUser(UserVO.PageUserVO pageUserVO) { public Page<UmsAdmin> pageUser(UserVO.PageUserVO pageUserVO) { int pageSize = pageUserVO.getPageSize(); int current = pageUserVO.getCurrent(); Page<UmsAdmin> page = new Page<>(current, pageSize); /* LambdaQueryWrapper<UmsAdmin> queryWrapper = new LambdaQueryWrapper<>(); if (StringUtils.isNotBlank(pageUserVO.getKeyword())) { queryWrapper.like(UmsAdmin::getUsername, pageUserVO.getKeyword()) .or().like(UmsAdmin::getNickName, pageUserVO.getKeyword()) .or().like(UmsAdmin::getMobile, pageUserVO.getKeyword()); } if (StringUtils.isNotBlank(pageUserVO.getJobTitle())) { queryWrapper.eq(UmsAdmin::getJobTitle, pageUserVO.getJobTitle()); } if (PojoUtils.Vo.isUsefulSearchParam(pageUserVO.getUserType())) { queryWrapper.eq(UmsAdmin::getUserType, pageUserVO.getUserType()); }*/ Page<UmsAdmin> page1 = baseMapper.selectCondPage(page,pageUserVO); return page1; return umsAdminMapper.selectPageByWordKey(page,pageUserVO.getKeyword()); } @Override ycl-common/src/main/java/com/ycl/service/user/impl/UmsDepartManageServiceImpl.java
@@ -145,9 +145,5 @@ umsDepartManage.setCreateTime(new Date()); umsDepartManage.setDepartId(departId); umsDepartManageMapper.insert(umsDepartManage); UmsAdmin umsAdmin = new UmsAdmin(); umsAdmin.setDepartmentId(departId); umsAdmin.setId(userId); umsAdminService.updateById(umsAdmin); } } ycl-common/src/main/java/com/ycl/vo/user/UserVO.java
@@ -15,19 +15,6 @@ @Data @ApiModel public static class PageUserVO extends BasePageVO { @ApiModelProperty(value = "部门id,0即为查询全部，默认0",example = "0") private Long departmentId; @ApiModelProperty(value = "用户类型,0即为查询全部，默认0",example = "0") private byte userType; @ApiModelProperty(value = "职务") private String jobTitle; @ApiModelProperty(value = "电话") private String mobile; @ApiModelProperty(value = "关键字") private String keyword;
@@ -45,12 +45,68 @@ </collection> </resultMap> <resultMap id="adminMap" type="com.ycl.entity.user.UmsAdmin"> <id column="id" property="id"/> <result column="username" property="username"/> <result column="password" property="password"/> <result column="icon" property="icon"/> <result column="email" property="email"/> <result column="nick_name" property="nickName"/> <result column="note" property="note"/> <result column="create_time" property="createTime"/> <result column="login_time" property="loginTime"/> <result column="status" property="status"/> <result column="mac_address" property="macAddress"/> <result column="ip_address" property="ipAddress"/> <result column="is_dy" property="isDy"/> <result column="job_title" property="jobTitle"/> <result column="depart_name" property="departName"/> <result column="user_type" property="userType"/> <result column="zj" property="zj"/> <result column="mobile" property="mobile"/> <!--一对多映射用这个 ofTyp是一对多的集合的所存放的实体类 javaType实体类的属性类型--> <collection property="roles" ofType="com.ycl.entity.user.UmsRole" javaType="list" column="id" select="selectAdminRoles"> <id column="id" property="id"/> <result column="name" property="name"/> <result column="description" property="description"/> <result column="admin_count" property="adminCount"/> <result column="create_time" property="createTime"/> <result column="status" property="status"/> <result column="sort" property="sort"/> </collection> </resultMap> <select id="getAdminIdList" resultType="java.lang.Long"> SELECT DISTINCT ar.admin_id FROM ums_role_resource_relation rr LEFT JOIN ums_admin_role_relation ar ON rr.role_id = ar.role_id WHERE rr.resource_id = #{resourceId} </select> <select id="selectPageByWordKey" resultMap="adminMap"> SELECT t1.*, t3.depart_name FROM `ums_admin` t1 LEFT JOIN ums_depart_manager t2 ON t1.id = t2.user_id LEFT JOIN ums_depart t3 ON t2.depart_id = t3.id <where> <if test="keyword !=null and keyword !='' "> ( t1.username LIKE concat('%', #{keyword}, '%') OR t1.nick_name LIKE concat('%', #{keyword}, '%') OR t1.mobile LIKE concat('%', #{keyword}, '%') ) </if> </where> </select> <select id="selectAdminRoles" resultType="com.ycl.entity.user.UmsRole"> select t5.* from `ums_admin` t1 left join ums_admin_role_relation t4 on t1.id = t4.admin_id left join ums_role t5 on t4.role_id = t5.id where t1.id=#{id} </select> <select id="selectCondPage" parameterType="com.ycl.entity.user.UmsAdmin" resultMap="CondMapResultMap"> SELECT
