From fa3016819bb53bf2e13d39ff15b1a4d85b250e60 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Sun, 5 Jan 2025 09:55:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=85=AC=E5=8F=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/bonus/system/domain/UserMenuParams.java | 6 ++---- .../com/bonus/system/service/impl/SysDeptServiceImpl.java | 2 +- .../src/main/resources/mapper/system/SysMenuMapper.xml | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/domain/UserMenuParams.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/domain/UserMenuParams.java index 0e8d141..c425b74 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/domain/UserMenuParams.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/domain/UserMenuParams.java @@ -1,13 +1,11 @@ package com.bonus.system.domain; -import lombok.Getter; -import lombok.Setter; +import lombok.Data; /** * @author wangvivi */ -@Setter -@Getter +@Data public class UserMenuParams { private Long userId; private Long systemType; diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysDeptServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysDeptServiceImpl.java index 3cd2c98..6c33444 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysDeptServiceImpl.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysDeptServiceImpl.java @@ -301,7 +301,7 @@ public class SysDeptServiceImpl implements ISysDeptService dept.setAncestors("0"); dept.setStatus("0");//默认启用 dept.setMenuTemplateId(1L);//TODO 将来用前端传的模版ID - dept.setLeader(dept.getSysUser().getUserName()); + dept.setInitPassword(SecurityUtils.encryptPassword(dept.getSysUser().getPassword())); if (StringUtils.isNotNull(dept.getSysUser()) && !userService.checkUserNameUnique(dept.getSysUser())) { throw new ServiceException("新增公司管理员用户'" + dept.getSysUser().getUserName() + "'失败，登录账号已存在"); } diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysMenuMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysMenuMapper.xml index 6736ebf..c78fa9e 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysMenuMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysMenuMapper.xml @@ -111,7 +111,7 @@ where u.user_id = #{userId} and m.menu_type in ('M', 'C') and m.status = 0 AND ro.status = 0 AND FIND_IN_SET(#{systemType}, m.system_type) AND exists ( - select 0 from sys_template_menu stm where stm.temp_id = #{templateId} and stm.menu_id = m.menu_id + select 0 from sys_template_menu stm where stm.temp_id = #{menuTemplateId} and stm.menu_id = m.menu_id ) order by m.parent_id, m.order_num