From e36d04ec40732f9a704f8650f98ad19c305979ab Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Sun, 5 Jan 2025 09:26:54 +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

---
 .../java/com/bonus/system/api/domain/SysDept.java     | 10 +++++-----
 .../bonus/system/service/impl/SysDeptServiceImpl.java | 11 ++---------
 .../main/resources/mapper/system/SysDeptMapper.xml    |  8 ++++----
 sql/bns_202412_patch.sql                              |  6 +++++-
 4 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysDept.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysDept.java
index ad52639..a0be524 100644
--- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysDept.java
+++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysDept.java
@@ -75,7 +75,7 @@ public class SysDept extends BaseEntity {
     private String parentName;
 
     //权限模版ID
-    private Long templateId;
+    private Long menuTemplateId;
 
     /**
      * 省
@@ -124,12 +124,12 @@ public class SysDept extends BaseEntity {
 
     private String keyWord;
 
-    public Long getTemplateId() {
-        return templateId;
+    public Long getMenuTemplateId() {
+        return menuTemplateId;
     }
 
-    public void setTemplateId(Long templateId) {
-        this.templateId = templateId;
+    public void setMenuTemplateId(Long menuTemplateId) {
+        this.menuTemplateId = menuTemplateId;
     }
 
     public void setCity(String city) {
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 7833eed..62ba737 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
@@ -300,7 +300,7 @@ public class SysDeptServiceImpl implements ISysDeptService
             dept.setParentId(0L);
             dept.setAncestors("0");
             dept.setStatus("0");//默认启用
-            dept.setTemplateId(1L);//TODO 将来用前端传的模版ID
+            dept.setMenuTemplateId(1L);//TODO 将来用前端传的模版ID
             dept.setLeader(dept.getSysUser().getUserName());
             dept.setPhone(dept.getSysUser().getPhonenumber());
             if (StringUtils.isNotNull(dept.getSysUser()) && !userService.checkUserNameUnique(dept.getSysUser())) {
@@ -488,9 +488,8 @@ public class SysDeptServiceImpl implements ISysDeptService
 
         //对初始化管理员赋值菜单权限
         List<SysRoleMenu> sysRoleMenulist = new ArrayList<>();
-        //TODO 用模板里的菜单ID赋值给公司管理员
         SysTemplateMenu sysTemplateMenu = new SysTemplateMenu();
-        sysTemplateMenu.setTempId(sysDept.getTemplateId());
+        sysTemplateMenu.setTempId(sysDept.getMenuTemplateId());
         List<SysTemplateMenu> sysTemplateMenus = sysTemplateMenuMapper.queryAll(sysTemplateMenu);
         SysRoleMenu sysRoleMenu = null;
         for (SysTemplateMenu stm : sysTemplateMenus) {
@@ -514,12 +513,6 @@ public class SysDeptServiceImpl implements ISysDeptService
         user.setDeptId(dept.getDeptId());
         user.setUserId(oldCompanyAdmin.getUserId());
         userMapper.updateUser(user);
-
-//        SysRole role = new SysRole();
-//        role.setUpdateTime(DateUtils.getNowDate());
-//        role.setUpdateBy(SecurityUtils.getUsername());
-//        role.setRoleId(oldSysUser.getRoleId());
-//        roleMapper.updateRole(role);
     }
 }
 
diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysDeptMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysDeptMapper.xml
index 1e75f41..f9b56e6 100644
--- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="createTime" column="create_time" />
 		<result property="updateBy"   column="update_by"   />
 		<result property="updateTime" column="update_time" />
-		<result property="templateId" column="template_id" />
+		<result property="menuTemplateId" column="menu_template_id" />
 		<result property="province" column="province" />
 		<result property="city" column="city" />
 		<result property="district" column="district" />
@@ -44,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                d.del_flag,
                d.create_by,
                d.create_time,
-               d.template_id,
+               d.menu_template_id,
                d.province,
                d.city,
                d.district,
@@ -176,7 +176,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="logo != null and logo != ''">logo,</if>
 		<if test="initPassword != null and initPassword != ''">init_password,</if>
         <if test="status != null">status,</if>
-		<if test="templateId != null">template_id,</if>
+		<if test="menuTemplateId != null">menu_template_id,</if>
         <if test="createBy != null and createBy != ''">create_by,</if>
         create_time
         )values(
@@ -197,7 +197,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="logo != null and logo != ''">#{logo},</if>
 		<if test="initPassword != null and initPassword != ''">#{initPassword},</if>
         <if test="status != null">#{status},</if>
-		<if test="templateId != null">#{templateId},</if>
+		<if test="menuTemplateId != null">#{menuTemplateId},</if>
         <if test="createBy != null and createBy != ''">#{createBy},</if>
         sysdate()
         )
diff --git a/sql/bns_202412_patch.sql b/sql/bns_202412_patch.sql
index 522f6e5..8eaed7a 100644
--- a/sql/bns_202412_patch.sql
+++ b/sql/bns_202412_patch.sql
@@ -1,5 +1,7 @@
 SET NAMES utf8mb4;
 
+-- 省
+alter table sys_dept add menu_template_id bigint(20) null comment '菜单模版ID';
 -- 省
 alter table sys_dept add province varchar(50) null comment '省';
 -- 市
@@ -13,4 +15,6 @@ alter table sys_dept add dept_abbreviation varchar(255) null comment '公司简
 -- 公司概述
 alter table sys_dept add remark varchar(255) null comment '公司概述';
 -- 公司logo
-alter table sys_dept add logo varchar(255) null comment '公司logo';
\ No newline at end of file
+alter table sys_dept add logo varchar(255) null comment '公司logo';
+-- 公司用户初始密码
+alter table sys_dept add init_password varchar(255) null comment '公司用户初始密码';
\ No newline at end of file