From 315c045c2bc35bd8cfb21c0d0fbaf170ba1b839f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=91=E5=B9=B4=E6=A2=A6=E4=B8=8E=E7=A0=96?=
 <2847127106@qq.com>
Date: Sat, 21 Sep 2024 20:32:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E7=A7=9F=E6=88=B7=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cloud-firm/src/main/resources/logback/dev.xml |  2 +-
 .../src/main/resources/logback/prod.xml       |  2 +-
 .../src/main/resources/logback/test.xml       |  2 +-
 .../system/controller/SysDeptController.java  |  1 +
 .../com/muyu/system/mapper/SysDeptMapper.java |  2 ++
 .../service/impl/SysDeptServiceImpl.java      |  6 +++++-
 .../resources/mapper/system/SysDeptMapper.xml | 20 +++++++++++--------
 7 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/cloud-firm/src/main/resources/logback/dev.xml b/cloud-firm/src/main/resources/logback/dev.xml
index 621579c..692c176 100644
--- a/cloud-firm/src/main/resources/logback/dev.xml
+++ b/cloud-firm/src/main/resources/logback/dev.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="60 seconds" debug="false">
     <!-- 日志存放路径 -->
-    <property name="log.path" value="logs/cloud-car"/>
+    <property name="log.path" value="logs/cloud-firm"/>
     <!-- 日志输出格式 -->
     <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
 
diff --git a/cloud-firm/src/main/resources/logback/prod.xml b/cloud-firm/src/main/resources/logback/prod.xml
index 2419bf9..1ee8a6c 100644
--- a/cloud-firm/src/main/resources/logback/prod.xml
+++ b/cloud-firm/src/main/resources/logback/prod.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="60 seconds" debug="false">
     <!-- 日志存放路径 -->
-    <property name="log.path" value="logs/cloud-car"/>
+    <property name="log.path" value="logs/cloud-firm"/>
     <!-- 日志输出格式 -->
     <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
     <property name="log.sky.pattern" value="%d{HH:mm:ss.SSS} %yellow([%tid]) [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
diff --git a/cloud-firm/src/main/resources/logback/test.xml b/cloud-firm/src/main/resources/logback/test.xml
index 2419bf9..1ee8a6c 100644
--- a/cloud-firm/src/main/resources/logback/test.xml
+++ b/cloud-firm/src/main/resources/logback/test.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="60 seconds" debug="false">
     <!-- 日志存放路径 -->
-    <property name="log.path" value="logs/cloud-car"/>
+    <property name="log.path" value="logs/cloud-firm"/>
     <!-- 日志输出格式 -->
     <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
     <property name="log.sky.pattern" value="%d{HH:mm:ss.SSS} %yellow([%tid]) [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDeptController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDeptController.java
index 4a7a76b..49af06c 100644
--- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDeptController.java
+++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDeptController.java
@@ -72,6 +72,7 @@ public class SysDeptController extends BaseController {
             return error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
         }
         dept.setCreateBy(SecurityUtils.getUsername());
+        dept.setFirmCode(SecurityUtils.getSaasKey());
         return toAjax(deptService.insertDept(dept));
     }
 
diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysDeptMapper.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysDeptMapper.java
index 5ef9ab4..e8afd39 100644
--- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysDeptMapper.java
+++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysDeptMapper.java
@@ -128,4 +128,6 @@ public interface SysDeptMapper extends BaseMapper<SysDept> {
      * @return 结果
      */
     public int deleteDeptById (Long deptId);
+
+    int updateDeptFirmCode(@Param("deptId") Long deptId);
 }
diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDeptServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDeptServiceImpl.java
index a55301b..7c1a980 100644
--- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDeptServiceImpl.java
+++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDeptServiceImpl.java
@@ -17,6 +17,7 @@ import com.muyu.system.mapper.SysRoleMapper;
 import com.muyu.system.service.SysDeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -204,6 +205,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
      * @return 结果
      */
     @Override
+    @Transactional
     public int insertDept (SysDept dept) {
         SysDept info = deptMapper.selectDeptById(dept.getParentId());
         // 如果父节点不为正常状态,则不允许新增子节点
@@ -211,7 +213,9 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
             throw new ServiceException("部门停用，不允许新增");
         }
         dept.setAncestors(info.getAncestors() + "," + dept.getParentId());
-        return deptMapper.insertDept(dept);
+        deptMapper.insertDept(dept);
+        // 修改saas编码
+        return deptMapper.updateDeptFirmCode(dept.getDeptId());
     }
 
     /**
diff --git a/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysDeptMapper.xml b/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysDeptMapper.xml
index 7a7f4bf..f110ef9 100644
--- a/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -46,8 +46,8 @@
         <if test="deptId != null and deptId != 0">
             AND dept_id = #{deptId}
         </if>
-        <if test="firmCode != null and firmCode != ''">
-            AND firm_code = #{firmCode}
+        <if test="firmCode != null and firmCode != '' and firmCode != 'FIRM'">
+            AND instr(firm_code, #{firmCode})
         </if>
         <if test="parentId != null and parentId != 0">
             AND parent_id = #{parentId}
@@ -114,11 +114,10 @@
         where dept_name=#{deptName} and parent_id = #{parentId} and del_flag = '0' limit 1
     </select>
 
-    <insert id="insertDept" parameterType="com.muyu.common.system.domain.SysDept">
+    <insert id="insertDept" parameterType="com.muyu.common.system.domain.SysDept" useGeneratedKeys="true" keyProperty="deptId">
         insert into sys_dept(
-        <if test="deptId != null and deptId != 0">dept_id,</if>
         <if test="parentId != null and parentId != 0">parent_id,</if>
-        <if test="firmCode != null and firmCode != 0">firm_code,</if>
+        <if test="firmCode != null and firmCode != ''">firm_code,</if>
         <if test="deptName != null and deptName != ''">dept_name,</if>
         <if test="ancestors != null and ancestors != ''">ancestors,</if>
         <if test="orderNum != null">order_num,</if>
@@ -129,10 +128,9 @@
         <if test="createBy != null and createBy != ''">create_by,</if>
         create_time
         )values(
-        <if test="deptId != null and deptId != 0">#{deptId},</if>
         <if test="parentId != null and parentId != 0">#{parentId},</if>
-        <if test="deptName != null and deptName != ''">#{deptName},</if>
         <if test="firmCode != null and firmCode != ''">#{firmCode},</if>
+        <if test="deptName != null and deptName != ''">#{deptName},</if>
         <if test="ancestors != null and ancestors != ''">#{ancestors},</if>
         <if test="orderNum != null">#{orderNum},</if>
         <if test="leader != null and leader != ''">#{leader},</if>
@@ -140,7 +138,7 @@
         <if test="email != null and email != ''">#{email},</if>
         <if test="status != null">#{status},</if>
         <if test="createBy != null and createBy != ''">#{createBy},</if>
-        sysdate()
+        now()
         )
     </insert>
 
@@ -182,6 +180,12 @@
         </foreach>
     </update>
 
+    <update id="updateDeptFirmCode">
+        update sys_dept
+        set firm_code = CONCAT(firm_code,'_',#{deptId})
+        where dept_id = #{deptId}
+    </update>
+
     <delete id="deleteDeptById" parameterType="Long">
         update sys_dept
         set del_flag = '2'