ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add:新增分组管理

Browse Source
This commit is contained in:
sunzheng
2024-08-02 14:37:36 +08:00
parent 517e96fdc1
commit 95333d5a08
17 changed files with 552 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
+2 -1
View File
@@ -137,6 +137,7 @@ public class SysUserController {
// 处理手机号和邮箱，进行对应加密
Map<String, String[]> parameterMap = req.getParameterMap();
String groupId = req.getParameter("groupId");
this.sysUserService.encryptReqMapData(parameterMap);
user.setEmail(this.sysUserService.proceedEmailEncrypt(user.getEmail()));
user.setPhone(this.sysUserService.proceedPhoneEncrypt(user.getPhone()));
@@ -155,7 +156,7 @@ public class SysUserController {
queryWrapper.ne("username", "admin");
IPage<SysUser> pageList;
try {
pageList = sysUserService.queryPage(page, subDepIds, roleId, queryWrapper);
pageList = sysUserService.queryPage(page, subDepIds, roleId, groupId, queryWrapper);
}catch (Exception e){
return Result.error(MessageUtils.getMessage(ResultCommon.ERROR));
}
laws-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java
+2 -1
View File
@@ -30,7 +30,8 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
* 分页查询用户，可支持组织机构检索
* @return
*/
IPage<SysUser> queryPage(Page<SysUser> page, @Param("departIds") List<String> subDepIds , @Param("roleId") String roleId , @Param(Constants.WRAPPER) Wrapper<SysUser> wrapper);
IPage<SysUser> queryPage(Page<SysUser> page, @Param("departIds") List<String> subDepIds , @Param("roleId") String roleId ,
@Param("groupId") String groupId, @Param(Constants.WRAPPER) Wrapper<SysUser> wrapper);
/**
* 通过用户账号查询用户信息
laws-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml
+4
View File
@@ -12,6 +12,10 @@
</foreach>
)
</if>
<if test="groupId != null and groupId !=' '">
and id in (select user_id from sys_user_group where group_id = #{groupId}
)
</if>
<if test="roleId!=null and roleId!=''">
and id in (select user_id from sys_user_role where role_id = #{roleId}
)
laws-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java
+1 -1
View File
@@ -36,7 +36,7 @@ public interface ISysUserService extends IService<SysUser> {
* @param queryWrapper
* @return
*/
IPage<SysUser> queryPage(Page<SysUser> page, List<String> subDepIds, String roleId, QueryWrapper<SysUser> queryWrapper);
IPage<SysUser> queryPage(Page<SysUser> page, List<String> subDepIds, String roleId, String groupId, QueryWrapper<SysUser> queryWrapper);
/**
* 重置密码
laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java
+2 -2
View File
@@ -79,8 +79,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
private ISysUserService sysUserService;
@Override
public IPage<SysUser> queryPage(Page<SysUser> page, List<String> subDepIds, String roleId, QueryWrapper<SysUser> queryWrapper){
IPage<SysUser> sysUserIPage = this.userMapper.queryPage(page, subDepIds, roleId, queryWrapper);
public IPage<SysUser> queryPage(Page<SysUser> page, List<String> subDepIds, String roleId, String groupId, QueryWrapper<SysUser> queryWrapper){
IPage<SysUser> sysUserIPage = this.userMapper.queryPage(page, subDepIds, roleId, groupId, queryWrapper);
sysUserIPage.getRecords().forEach(user -> {
// 对手机号、邮箱进行解密处理
proceedUserInfoDecrypt(user);