From 8c6494baef35ce8fc027bb6833e7e8dcc60d5e49 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Sun, 5 Jan 2025 12:13:36 +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/controller/SysDeptController.java    | 1 +
 .../java/com/bonus/system/service/impl/SysDeptServiceImpl.java | 2 --
 .../src/main/resources/mapper/system/SysDeptMapper.xml         | 3 +++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysDeptController.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysDeptController.java
index 461aa8d..ed68688 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysDeptController.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysDeptController.java
@@ -70,6 +70,7 @@ public class SysDeptController extends BaseController
         List<SysDept> deptList = new ArrayList<>();
         try{
             startPage();
+            dept.setCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId());
             deptList = deptService.getDeptList(dept);
             return getDataTable(deptList);
         }catch (Exception e){
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 782a262..643b481 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,6 @@ public class SysDeptServiceImpl implements ISysDeptService
             dept.setAncestors("0");
             dept.setStatus("0");//默认启用
             dept.setMenuTemplateId(1L);//TODO 将来用前端传的模版ID
-            //dept.setInitPassword(dept.getSysUser().getPassword());
             int result = deptMapper.insertDept(dept);
             if (systemConfig.isAddRootCompany() && result > 0) {
                 if (StringUtils.isNotNull(dept.getSysUser()) && !userService.checkUserNameUnique(dept.getSysUser())) {
@@ -507,7 +506,6 @@ public class SysDeptServiceImpl implements ISysDeptService
     private void updateCompanyAdminUserAndRole(SysDept dept) {
         SysUser oldCompanyAdmin = deptMapper.selectCompanyAdminByDept(dept.getDeptId());
         SysUser user = dept.getSysUser();
-        user.setPassword(SecurityUtils.encryptPassword(dept.getInitPassword()));
         user.setUpdateBy(SecurityUtils.getUsername());
         user.setUpdateTime(DateUtils.getNowDate());
         user.setDeptId(dept.getDeptId());
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 7167254..9a2b055 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
@@ -81,6 +81,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<select id="getDeptList" resultType="com.bonus.system.api.domain.SysDept">
 		select * from sys_dept sd where parent_id='0' and del_flag='0'
+		<if test="companyId != null and companyId != 0">
+			AND dept_id != #{companyId}
+		</if>
 		<if test="keyWord != null  and keyWord != ''">
 			and sd.dept_name like concat('%', #{keyWord}, '%')
 		</if>