src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -135,10 +135,10 @@ * 自定义用户列表(只有保安员) */ @GetMapping("/page-security") public R<IPage<UserVO>> pageSecurity(@ApiIgnore User user, Query query, Long deptId, BladeUser bladeUser) { public R<IPage<UserVO>> pageSecurity(@ApiIgnore UserVO user, Query query, Long deptId, BladeUser bladeUser) { user.setAccount("admin"); IPage<User> pages = userService.selectUserPageSecurity(Condition.getPage(query), user, deptId, (bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : bladeUser.getTenantId())); return R.data(UserWrapper.build().pageVO(pages)); IPage<UserVO> pages = userService.selectUserPageSecurity(Condition.getPage(query), user, deptId, (bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : bladeUser.getTenantId())); return R.data(pages); } /** src/main/java/org/springblade/modules/system/entity/User.java
@@ -150,8 +150,10 @@ private String hold; private String jurisdiction; private String securitynumber; @TableField("examination_type") private String examinationType; @TableField("examination_mx") private String examinationMx; private String fingerprint; src/main/java/org/springblade/modules/system/mapper/UserMapper.java
@@ -16,12 +16,16 @@ */ package org.springblade.modules.system.mapper; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.SqlParser; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; import org.springblade.modules.system.excel.UserExcel; import org.springblade.modules.system.entity.User; import org.springblade.modules.system.vo.UserVO; import org.springframework.boot.autoconfigure.quartz.QuartzDataSource; import java.util.List; @@ -66,7 +70,8 @@ /** * 自定义用户列表(只有保安员) */ List<User> selectUserPageSecurity(IPage<User> page, @Param("user") User user, @Param("deptIdList") List<Long> deptIdList, @Param("tenantId") String tenantId); @SqlParser(filter = true) List<UserVO> selectUserPageSecurity(IPage<UserVO> page, @Param("user") UserVO user, @Param("deptIdList") List<Long> deptIdList, @Param("tenantId") String tenantId); /** * 查询所有未注销用户 src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -39,8 +39,52 @@ <result column="hold" property="hold"/> <result column="jurisdiction" property="jurisdiction"/> <result column="securitynumber" property="securitynumber"/> <result column="examinationType" property="examinationType"/> <result column="examinationMx" property="examinationMx"/> <result column="examination_type" property="examinationType"/> <result column="examination_mx" property="examinationMx"/> <result column="fingerprint" property="fingerprint"/> <result column="photo" property="photo"/> <result column="dispatch" property="dispatch"/> <result column="my_picture" property="myPicture"/> </resultMap> <!-- 通用查询映射结果 --> <resultMap id="userResultMaps" type="org.springblade.modules.system.vo.UserVO"> <result column="id" property="id"/> <result column="tenant_id" property="tenantId"/> <result column="create_user" property="createUser"/> <result column="create_time" property="createTime"/> <result column="update_user" property="updateUser"/> <result column="update_time" property="updateTime"/> <result column="status" property="status"/> <result column="is_deleted" property="isDeleted"/> <result column="code" property="code"/> <result column="user_type" property="userType"/> <result column="account" property="account"/> <result column="password" property="password"/> <result column="name" property="name"/> <result column="real_name" property="realName"/> <result column="email" property="email"/> <result column="phone" property="phone"/> <result column="birthday" property="birthday"/> <result column="sex" property="sex"/> <result column="role_id" property="roleId"/> <result column="dept_id" property="deptId"/> <result column="post_id" property="postId"/> <result column="cardid" property="cardid"/> <result column="nativeplace" property="nativeplace"/> <result column="nation" property="nation"/> <result column="education" property="education"/> <result column="politicaloutlook" property="politicaloutlook"/> <result column="height" property="height"/> <result column="cell" property="cell"/> <result column="emails" property="emails"/> <result column="address" property="address"/> <result column="registered" property="registered"/> <result column="rtime" property="rtime"/> <result column="hold" property="hold"/> <result column="jurisdiction" property="jurisdiction"/> <result column="securitynumber" property="securitynumber"/> <result column="fingerprint" property="fingerprint"/> <result column="photo" property="photo"/> <result column="dispatch" property="dispatch"/> @@ -99,7 +143,7 @@ <!--保安员列表--> <select id="selectUserPageSecurity" resultMap="userResultMap"> <select id="selectUserPageSecurity" resultMap="userResultMaps"> select bu.* from @@ -157,7 +201,15 @@ </foreach> ) </if> ORDER BY bu.id <if test="user.useName==null or user.useName==''"> order by bu.id </if> <if test="user.useName!=null and user.useName!='' and user.useName=='examinationType'"> order by bu.examination_type ${user.sort} </if> <if test="user.useName!=null and user.useName!='' and user.useName=='examinationMx'"> order by bu.examination_mx ${user.sort} </if> </select>
@@ -211,7 +211,7 @@ /** * 自定义用户列表(只有保安员) */ IPage<User> selectUserPageSecurity(IPage<User> page, User user, Long deptId, String s); IPage<UserVO> selectUserPageSecurity(IPage<UserVO> page, UserVO user, Long deptId, String s); /** * 查询所有未注销用户 src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -432,7 +432,7 @@ * 自定义用户列表(只有保安员) */ @Override public IPage<User> selectUserPageSecurity(IPage<User> page, User user, Long deptId, String tenantId) { public IPage<UserVO> selectUserPageSecurity(IPage<UserVO> page, UserVO user, Long deptId, String tenantId) { List<Long> deptIdList = SysCache.getDeptChildIds(deptId); return page.setRecords(baseMapper.selectUserPageSecurity(page, user, deptIdList, tenantId)); } src/main/java/org/springblade/modules/system/vo/UserVO.java
@@ -81,4 +81,12 @@ * 拓展信息 */ private String userExt; private String useName; /** * 排序 */ private String sort; }
