diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 426903d7..b0561416 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,16 +2,21 @@ + - - + + - - - - - + + + + + + + + + - + @@ -179,7 +184,7 @@ - + @@ -204,13 +209,23 @@ file://$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java - 233 + 232 - file://$PROJECT_DIR$/src/main/java/com/lz/common/utils/FeishuUtil.java - 144 - + + file://$PROJECT_DIR$/src/main/java/com/lz/modules/sys/controller/SysUserController.java + 139 + + + file://$PROJECT_DIR$/src/main/java/com/lz/modules/sys/service/impl/SysUserServiceImpl.java + 57 + diff --git a/src/main/java/com/lz/modules/app/Dto/UserDto.java b/src/main/java/com/lz/modules/app/Dto/UserDto.java new file mode 100644 index 00000000..581f85c8 --- /dev/null +++ b/src/main/java/com/lz/modules/app/Dto/UserDto.java @@ -0,0 +1,94 @@ +/** + * Copyright (c) 2020 fumeiai All rights reserved. + *

+ *

+ *

+ * 版权所有，侵权必究！ + */ + +package com.lz.modules.app.Dto; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + + +/** + * 用户 + * + * @author fumeiai@Linzikg.com + */ +@Data +public class UserDto implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 用户ID + */ + @TableId + private Long userId; + + /** + * 员工姓名 + */ + private String realName; + + /** + * 员工工号 + */ + private String userNo; + + /** + * 用户名 + */ + private String username; + + /** + * 密码 + */ + private String password; + + /** + * 手机号 + */ + private String mobile; + + /** + * 盐 + */ + private String salt; + + /** + * 邮箱 + */ + private String email; + + + /** + * 状态 0：禁用 1：正常 + */ + private Integer status; + + /** + * 角色ID列表 + */ + @TableField(exist = false) + private List roleIdList; + + /** + * 创建者ID + */ + private Long createUserId; + + /** + * 创建时间 + */ + private Date createTime; + + private String roleName; + +} diff --git a/src/main/java/com/lz/modules/app/entity/UserEntity.java b/src/main/java/com/lz/modules/app/entity/UserEntity.java index 05c1be0b..b6a3bec6 100644 --- a/src/main/java/com/lz/modules/app/entity/UserEntity.java +++ b/src/main/java/com/lz/modules/app/entity/UserEntity.java @@ -22,7 +22,7 @@ import java.util.Date; * @author Mark sunlightcs@gmail.com */ @Data -@TableName("tb_user") +@TableName("sys_user") public class UserEntity implements Serializable { private static final long serialVersionUID = 1L; @@ -31,6 +31,12 @@ public class UserEntity implements Serializable { */ @TableId private Long userId; + + private String realName; + + private String userNo; + + private String status; /** * 用户名 */ diff --git a/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java b/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java index 46d6d224..22226db8 100644 --- a/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java +++ b/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java @@ -1,6 +1,5 @@ package com.lz.modules.app.service.impl; -import cn.hutool.core.util.NumberUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; diff --git a/src/main/java/com/lz/modules/sys/controller/SysUserController.java b/src/main/java/com/lz/modules/sys/controller/SysUserController.java index 015173cd..3cf424d8 100644 --- a/src/main/java/com/lz/modules/sys/controller/SysUserController.java +++ b/src/main/java/com/lz/modules/sys/controller/SysUserController.java @@ -1,13 +1,14 @@ /** * Copyright (c) 2020 fumeiai All rights reserved. - * - * - * + *

+ *

+ *

* 版权所有，侵权必究！ */ package com.lz.modules.sys.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.lz.common.annotation.SysLog; import com.lz.common.utils.Constant; import com.lz.common.utils.PageUtils; @@ -16,6 +17,7 @@ import com.lz.common.validator.Assert; import com.lz.common.validator.ValidatorUtils; import com.lz.common.validator.group.AddGroup; import com.lz.common.validator.group.UpdateGroup; +import com.lz.modules.app.entity.UserEntity; import com.lz.modules.sys.entity.SysUserEntity; import com.lz.modules.sys.form.PasswordForm; import com.lz.modules.sys.service.SysUserRoleService; @@ -37,123 +39,129 @@ import java.util.Map; @RestController @RequestMapping("/sys/user") public class SysUserController extends AbstractController { - @Autowired - private SysUserService sysUserService; - @Autowired - private SysUserRoleService sysUserRoleService; + @Autowired + private SysUserService sysUserService; + @Autowired + private SysUserRoleService sysUserRoleService; - /** - * 所有用户列表 - */ - @GetMapping("/list") - @RequiresPermissions("sys:user:list") - public R list(@RequestParam Map params){ - //只有超级管理员，才能查看所有管理员列表 - if(getUserId() != Constant.SUPER_ADMIN){ - params.put("createUserId", getUserId()); - } - PageUtils page = sysUserService.queryPage(params); + /** + * 所有用户列表 + */ + @GetMapping("/list") + @RequiresPermissions("sys:user:list") + public R list(@RequestParam Map params) { + //只有超级管理员，才能查看所有管理员列表 + if (getUserId() != Constant.SUPER_ADMIN) { + params.put("createUserId", getUserId()); + } - return R.ok().put("page", page); - } + PageUtils page = sysUserService.queryPage(params); - /** - * 获取登录的用户信息 - */ - @GetMapping("/info") - public R info(){ - return R.ok().put("user", getUser()); - } - /** - * 修改登录用户密码 - */ - @SysLog("修改密码") - @PostMapping("/password") - public R password(@RequestBody PasswordForm form){ - Assert.isBlank(form.getNewPassword(), "新密码不为能空"); + return R.ok().put("page", page); + } - //sha256加密 - String password = new Sha256Hash(form.getPassword(), getUser().getSalt()).toHex(); - //sha256加密 - String newPassword = new Sha256Hash(form.getNewPassword(), getUser().getSalt()).toHex(); + /** + * 获取登录的用户信息 + */ + @GetMapping("/info") + public R info() { + return R.ok().put("user", getUser()); + } - //更新密码 - boolean flag = sysUserService.updatePassword(getUserId(), password, newPassword); - if(!flag){ - return R.error("原密码不正确"); - } + /** + * 修改登录用户密码 + */ + @SysLog("修改密码") + @PostMapping("/password") + public R password(@RequestBody PasswordForm form) { + Assert.isBlank(form.getNewPassword(), "新密码不为能空"); - return R.ok(); - } + //sha256加密 + String password = new Sha256Hash(form.getPassword(), getUser().getSalt()).toHex(); + //sha256加密 + String newPassword = new Sha256Hash(form.getNewPassword(), getUser().getSalt()).toHex(); - public static void main(String[] args) { - String newPassword = new Sha256Hash("Linzi!@#123", "YzcmCZNvbXocrsz9dm8e").toHex(); - System.out.println(newPassword); - } - /** - * 用户信息 - */ - @GetMapping("/info/{userId}") - @RequiresPermissions("sys:user:info") - public R info(@PathVariable("userId") Long userId){ - SysUserEntity user = sysUserService.getById(userId); + //更新密码 + boolean flag = sysUserService.updatePassword(getUserId(), password, newPassword); + if (!flag) { + return R.error("原密码不正确"); + } - //获取用户所属的角色列表 - List roleIdList = sysUserRoleService.queryRoleIdList(userId); - user.setRoleIdList(roleIdList); + return R.ok(); + } - return R.ok().put("user", user); - } + public static void main(String[] args) { + String newPassword = new Sha256Hash("Linzi!@#123", "YzcmCZNvbXocrsz9dm8e").toHex(); + System.out.println(newPassword); + } - /** - * 保存用户 - */ - @SysLog("保存用户") - @PostMapping("/save") - @RequiresPermissions("sys:user:save") - public R save(@RequestBody SysUserEntity user){ - ValidatorUtils.validateEntity(user, AddGroup.class); + /** + * 用户信息 + */ + @GetMapping("/info/{userId}") + @RequiresPermissions("sys:user:info") + public R info(@PathVariable("userId") Long userId) { + SysUserEntity user = sysUserService.getById(userId); - user.setCreateUserId(getUserId()); - sysUserService.saveUser(user); + //获取用户所属的角色列表 + List roleIdList = sysUserRoleService.queryRoleIdList(userId); + user.setRoleIdList(roleIdList); - return R.ok(); - } + return R.ok().put("user", user); + } - /** - * 修改用户 - */ - @SysLog("修改用户") - @PostMapping("/update") - @RequiresPermissions("sys:user:update") - public R update(@RequestBody SysUserEntity user){ - ValidatorUtils.validateEntity(user, UpdateGroup.class); + /** + * 保存用户 + */ + @SysLog("保存用户") + @PostMapping("/save") + @RequiresPermissions("sys:user:save") + public R save(@RequestBody SysUserEntity user) { + ValidatorUtils.validateEntity(user, AddGroup.class); + SysUserEntity queryUser = sysUserService.getOne(new QueryWrapper().eq("mobile", user.getMobile())); + if (queryUser != null) { + return R.error("该手机号已存在，请重新输入！"); + } + user.setCreateUserId(getUserId()); + sysUserService.saveUser(user); - user.setCreateUserId(getUserId()); - sysUserService.update(user); + return R.ok(); + } - return R.ok(); - } + /** + * 修改用户 + */ + @SysLog("修改用户") + @PostMapping("/update") + @RequiresPermissions("sys:user:update") + public R update(@RequestBody SysUserEntity user) { + ValidatorUtils.validateEntity(user, UpdateGroup.class); - /** - * 删除用户 - */ - @SysLog("删除用户") - @PostMapping("/delete") - @RequiresPermissions("sys:user:delete") - public R delete(@RequestBody Long[] userIds){ - if(ArrayUtils.contains(userIds, 1L)){ - return R.error("系统管理员不能删除"); - } + user.setCreateUserId(getUserId()); + sysUserService.update(user); - if(ArrayUtils.contains(userIds, getUserId())){ - return R.error("当前用户不能删除"); - } + return R.ok(); + } - sysUserService.deleteBatch(userIds); + /** + * 删除用户 + */ + @SysLog("删除用户") + @PostMapping("/delete") + @RequiresPermissions("sys:user:delete") + public R delete(@RequestBody Long[] userIds) { + if (ArrayUtils.contains(userIds, 1L)) { + return R.error("系统管理员不能删除"); + } - return R.ok(); - } + if (ArrayUtils.contains(userIds, getUserId())) { + return R.error("当前用户不能删除"); + } + + sysUserService.deleteBatch(userIds); + + return R.ok(); + } } diff --git a/src/main/java/com/lz/modules/sys/dao/SysUserDao.java b/src/main/java/com/lz/modules/sys/dao/SysUserDao.java index 8bb951fa..d93c2e37 100644 --- a/src/main/java/com/lz/modules/sys/dao/SysUserDao.java +++ b/src/main/java/com/lz/modules/sys/dao/SysUserDao.java @@ -1,14 +1,15 @@ /** * Copyright (c) 2020 fumeiai All rights reserved. - * - * - * + *

+ *

+ *

* 版权所有，侵权必究！ */ package com.lz.modules.sys.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.lz.modules.app.Dto.UserDto; import com.lz.modules.sys.entity.SysUserEntity; import org.apache.ibatis.annotations.Mapper; @@ -22,20 +23,24 @@ import java.util.List; @Mapper public interface SysUserDao extends BaseMapper { - /** - * 查询用户的所有权限 - * @param userId 用户ID - */ - List queryAllPerms(Long userId); + /** + * 查询用户的所有权限 + * @param userId 用户ID + */ + List queryAllPerms(Long userId); - /** - * 查询用户的所有菜单ID - */ - List queryAllMenuId(Long userId); + /** + * 查询用户的所有菜单ID + */ + List queryAllMenuId(Long userId); - /** - * 根据用户名，查询系统用户 - */ - SysUserEntity queryByUserName(String username); + /** + * 根据用户名，查询系统用户 + */ + SysUserEntity queryByUserName(String username); + + List getUserInfos(String realName, Long createUserId, String mobile, String roleName, int pageLimit, int startIndex); + + int getTotalCount(String realName, Long createUserId, String mobile, String roleName); } diff --git a/src/main/java/com/lz/modules/sys/entity/SysUserEntity.java b/src/main/java/com/lz/modules/sys/entity/SysUserEntity.java index f4786d67..1413f5f7 100644 --- a/src/main/java/com/lz/modules/sys/entity/SysUserEntity.java +++ b/src/main/java/com/lz/modules/sys/entity/SysUserEntity.java @@ -37,10 +37,22 @@ public class SysUserEntity implements Serializable { @TableId private Long userId; + /** + * 员工姓名 + */ + @NotBlank(message="员工姓名不能为空", groups = {AddGroup.class, UpdateGroup.class}) + private String realName; + + /** + * 员工工号 + */ + @NotBlank(message="工号不能为空", groups = AddGroup.class) + private String userNo; + /** * 用户名 */ - @NotBlank(message="用户名不能为空", groups = {AddGroup.class, UpdateGroup.class}) + @NotBlank(message="账号不能为空", groups = {AddGroup.class, UpdateGroup.class}) private String username; /** @@ -49,22 +61,25 @@ public class SysUserEntity implements Serializable { @NotBlank(message="密码不能为空", groups = AddGroup.class) private String password; + /** + * 手机号 + */ + @NotBlank(message="手机号不能为空", groups = {AddGroup.class, UpdateGroup.class}) + private String mobile; + /** * 盐 */ private String salt; - /** - * 邮箱 - */ - @NotBlank(message="邮箱不能为空", groups = {AddGroup.class, UpdateGroup.class}) +// /** +// * 邮箱 +// */ +// @NotBlank(message="邮箱不能为空", groups = {AddGroup.class, UpdateGroup.class}) @Email(message="邮箱格式不正确", groups = {AddGroup.class, UpdateGroup.class}) private String email; - /** - * 手机号 - */ - private String mobile; + /** * 状态 0：禁用 1：正常 diff --git a/src/main/java/com/lz/modules/sys/service/impl/SysUserServiceImpl.java b/src/main/java/com/lz/modules/sys/service/impl/SysUserServiceImpl.java index 11033338..0b7fc01b 100644 --- a/src/main/java/com/lz/modules/sys/service/impl/SysUserServiceImpl.java +++ b/src/main/java/com/lz/modules/sys/service/impl/SysUserServiceImpl.java @@ -1,8 +1,8 @@ /** * Copyright (c) 2020 fumeiai All rights reserved. - * - * - * + *

+ *

+ *

* 版权所有，侵权必究！ */ @@ -15,6 +15,7 @@ import com.lz.common.exception.RRException; import com.lz.common.utils.Constant; import com.lz.common.utils.PageUtils; import com.lz.common.utils.Query; +import com.lz.modules.app.Dto.UserDto; import com.lz.modules.sys.dao.SysUserDao; import com.lz.modules.sys.entity.SysUserEntity; import com.lz.modules.sys.service.SysRoleService; @@ -40,106 +41,117 @@ import java.util.Map; */ @Service("sysUserService") public class SysUserServiceImpl extends ServiceImpl implements SysUserService { - @Autowired - private SysUserRoleService sysUserRoleService; - @Autowired - private SysRoleService sysRoleService; + @Autowired + private SysUserRoleService sysUserRoleService; + @Autowired + private SysRoleService sysRoleService; + @Autowired + private SysUserDao sysUserDao; - @Override - public PageUtils queryPage(Map params) { - String username = (String)params.get("username"); - Long createUserId = (Long)params.get("createUserId"); + @Override + public PageUtils queryPage(Map params) { + String realName = (String) params.get("realName"); + Long createUserId = (Long) params.get("createUserId"); + String mobile = (String) params.get("mobile"); + String roleName = (String) params.get("roleName"); - IPage page = this.page( - new Query().getPage(params), - new QueryWrapper() - .like(StringUtils.isNotBlank(username),"username", username) - .eq(createUserId != null,"create_user_id", createUserId) - ); + int pageSize = 20; + int currPage = 1; + if (params.containsKey("limit")) { + pageSize = Integer.parseInt(params.get("limit").toString()); + } - return new PageUtils(page); - } + if (params.containsKey("page")) { + currPage = Integer.parseInt(params.get("page").toString()); + } - @Override - public List queryAllPerms(Long userId) { - return baseMapper.queryAllPerms(userId); - } + List users = sysUserDao.getUserInfos(realName, createUserId, mobile, roleName, pageSize, (currPage - 1) * pageSize); + int totalCount = sysUserDao.getTotalCount(realName, createUserId, mobile, roleName); + PageUtils pageInfo = new PageUtils(users, totalCount, pageSize, currPage); - @Override - public List queryAllMenuId(Long userId) { - return baseMapper.queryAllMenuId(userId); - } + return pageInfo; + } - @Override - public SysUserEntity queryByUserName(String username) { - return baseMapper.queryByUserName(username); - } + @Override + public List queryAllPerms(Long userId) { + return baseMapper.queryAllPerms(userId); + } - @Override - @Transactional - public void saveUser(SysUserEntity user) { - user.setCreateTime(new Date()); - //sha256加密 - String salt = RandomStringUtils.randomAlphanumeric(20); - user.setPassword(new Sha256Hash(user.getPassword(), salt).toHex()); - user.setSalt(salt); - this.save(user); + @Override + public List queryAllMenuId(Long userId) { + return baseMapper.queryAllMenuId(userId); + } - //检查角色是否越权 - checkRole(user); + @Override + public SysUserEntity queryByUserName(String username) { + return baseMapper.queryByUserName(username); + } - //保存用户与角色关系 - sysUserRoleService.saveOrUpdate(user.getUserId(), user.getRoleIdList()); - } + @Override + @Transactional + public void saveUser(SysUserEntity user) { + user.setCreateTime(new Date()); + //sha256加密 + String salt = RandomStringUtils.randomAlphanumeric(20); + user.setPassword(new Sha256Hash(user.getPassword(), salt).toHex()); + user.setSalt(salt); + this.save(user); - @Override - @Transactional - public void update(SysUserEntity user) { - if(StringUtils.isBlank(user.getPassword())){ - user.setPassword(null); - }else{ - user.setPassword(new Sha256Hash(user.getPassword(), user.getSalt()).toHex()); - } - this.updateById(user); + //检查角色是否越权 + checkRole(user); - //检查角色是否越权 - checkRole(user); + //保存用户与角色关系 + sysUserRoleService.saveOrUpdate(user.getUserId(), user.getRoleIdList()); + } - //保存用户与角色关系 - sysUserRoleService.saveOrUpdate(user.getUserId(), user.getRoleIdList()); - } + @Override + @Transactional + public void update(SysUserEntity user) { + if (StringUtils.isBlank(user.getPassword())) { + user.setPassword(null); + } else { + user.setPassword(new Sha256Hash(user.getPassword(), user.getSalt()).toHex()); + } + this.updateById(user); - @Override - public void deleteBatch(Long[] userId) { - this.removeByIds(Arrays.asList(userId)); - } + //检查角色是否越权 + checkRole(user); - @Override - public boolean updatePassword(Long userId, String password, String newPassword) { - SysUserEntity userEntity = new SysUserEntity(); - userEntity.setPassword(newPassword); - return this.update(userEntity, - new QueryWrapper().eq("user_id", userId).eq("password", password)); - } + //保存用户与角色关系 + sysUserRoleService.saveOrUpdate(user.getUserId(), user.getRoleIdList()); + } - /** - * 检查角色是否越权 - */ - private void checkRole(SysUserEntity user){ - if(user.getRoleIdList() == null || user.getRoleIdList().size() == 0){ - return; - } - //如果不是超级管理员，则需要判断用户的角色是否自己创建 - if(user.getCreateUserId() == Constant.SUPER_ADMIN){ - return ; - } + @Override + public void deleteBatch(Long[] userId) { + this.removeByIds(Arrays.asList(userId)); + } - //查询用户创建的角色列表 - List roleIdList = sysRoleService.queryRoleIdList(user.getCreateUserId()); + @Override + public boolean updatePassword(Long userId, String password, String newPassword) { + SysUserEntity userEntity = new SysUserEntity(); + userEntity.setPassword(newPassword); + return this.update(userEntity, + new QueryWrapper().eq("user_id", userId).eq("password", password)); + } - //判断是否越权 - if(!roleIdList.containsAll(user.getRoleIdList())){ - throw new RRException("新增用户所选角色，不是本人创建"); - } - } + /** + * 检查角色是否越权 + */ + private void checkRole(SysUserEntity user) { + if (user.getRoleIdList() == null || user.getRoleIdList().size() == 0) { + return; + } + //如果不是超级管理员，则需要判断用户的角色是否自己创建 + if (user.getCreateUserId() == Constant.SUPER_ADMIN) { + return; + } + + //查询用户创建的角色列表 + List roleIdList = sysRoleService.queryRoleIdList(user.getCreateUserId()); + + //判断是否越权 + if (!roleIdList.containsAll(user.getRoleIdList())) { + throw new RRException("新增用户所选角色，不是本人创建"); + } + } } diff --git a/src/main/resources/mapper/sys/SysUserDao.xml b/src/main/resources/mapper/sys/SysUserDao.xml index 96548e55..8b8ad68c 100644 --- a/src/main/resources/mapper/sys/SysUserDao.xml +++ b/src/main/resources/mapper/sys/SysUserDao.xml @@ -2,23 +2,58 @@ - - select m.perms from sys_user_role ur LEFT JOIN sys_role_menu rm on ur.role_id = rm.role_id LEFT JOIN sys_menu m on rm.menu_id = m.menu_id where ur.user_id = #{userId} - - select distinct rm.menu_id from sys_user_role ur LEFT JOIN sys_role_menu rm on ur.role_id = rm.role_id where ur.user_id = #{userId} - select * from sys_user where username = #{username} + + + + diff --git a/target/classes/com/lz/modules/app/Dto/UserDto.class b/target/classes/com/lz/modules/app/Dto/UserDto.class new file mode 100644 index 00000000..07c249ff Binary files /dev/null and b/target/classes/com/lz/modules/app/Dto/UserDto.class differ diff --git a/target/classes/com/lz/modules/app/entity/UserEntity.class b/target/classes/com/lz/modules/app/entity/UserEntity.class index 9323c49a..4bb6a850 100644 Binary files a/target/classes/com/lz/modules/app/entity/UserEntity.class and b/target/classes/com/lz/modules/app/entity/UserEntity.class differ diff --git a/target/classes/com/lz/modules/app/service/impl/StaffServiceImpl.class b/target/classes/com/lz/modules/app/service/impl/StaffServiceImpl.class index 5cf6377b..aab61638 100644 Binary files a/target/classes/com/lz/modules/app/service/impl/StaffServiceImpl.class and b/target/classes/com/lz/modules/app/service/impl/StaffServiceImpl.class differ diff --git a/target/classes/com/lz/modules/sys/controller/SysUserController.class b/target/classes/com/lz/modules/sys/controller/SysUserController.class index 6989ba88..ce80376a 100644 Binary files a/target/classes/com/lz/modules/sys/controller/SysUserController.class and b/target/classes/com/lz/modules/sys/controller/SysUserController.class differ diff --git a/target/classes/com/lz/modules/sys/dao/SysUserDao.class b/target/classes/com/lz/modules/sys/dao/SysUserDao.class index c8cee759..279cbab4 100644 Binary files a/target/classes/com/lz/modules/sys/dao/SysUserDao.class and b/target/classes/com/lz/modules/sys/dao/SysUserDao.class differ diff --git a/target/classes/com/lz/modules/sys/entity/SysUserEntity.class b/target/classes/com/lz/modules/sys/entity/SysUserEntity.class index 5ec574e1..d169be1f 100644 Binary files a/target/classes/com/lz/modules/sys/entity/SysUserEntity.class and b/target/classes/com/lz/modules/sys/entity/SysUserEntity.class differ diff --git a/target/classes/com/lz/modules/sys/service/impl/SysUserServiceImpl.class b/target/classes/com/lz/modules/sys/service/impl/SysUserServiceImpl.class index b0d88f90..2513b1ab 100644 Binary files a/target/classes/com/lz/modules/sys/service/impl/SysUserServiceImpl.class and b/target/classes/com/lz/modules/sys/service/impl/SysUserServiceImpl.class differ diff --git a/target/classes/logback-spring.xml b/target/classes/logback-spring.xml index 8cd99cce..3c3c33fa 100644 --- a/target/classes/logback-spring.xml +++ b/target/classes/logback-spring.xml @@ -8,7 +8,7 @@ - + diff --git a/target/classes/mapper/sys/SysUserDao.xml b/target/classes/mapper/sys/SysUserDao.xml index 96548e55..8b8ad68c 100644 --- a/target/classes/mapper/sys/SysUserDao.xml +++ b/target/classes/mapper/sys/SysUserDao.xml @@ -2,23 +2,58 @@ - - select m.perms from sys_user_role ur LEFT JOIN sys_role_menu rm on ur.role_id = rm.role_id LEFT JOIN sys_menu m on rm.menu_id = m.menu_id where ur.user_id = #{userId} - - select distinct rm.menu_id from sys_user_role ur LEFT JOIN sys_role_menu rm on ur.role_id = rm.role_id where ur.user_id = #{userId} - select * from sys_user where username = #{username} + + + +