From 2d84b9771e11b64f4224c57ebc36a157fe9a15b4 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 21 十月 2025 14:52:59 +0800
Subject: [PATCH] Merge branch 'master' into 0929-master

---
 smartor/src/main/resources/mapper/smartor/SysDeptMapper.xml |   89 +++++++++++++++++++++++++++++++++++---------
 1 files changed, 71 insertions(+), 18 deletions(-)

diff --git a/smartor/src/main/resources/mapper/smartor/SysDeptMapper.xml b/smartor/src/main/resources/mapper/smartor/SysDeptMapper.xml
index 13bd562..cebb745 100644
--- a/smartor/src/main/resources/mapper/smartor/SysDeptMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SysDeptMapper.xml
@@ -57,7 +57,8 @@
         where d.del_flag = '0'
         <if test="deptId != null and deptId != 0">
             AND dept_id = #{deptId}
-        </if> <if test="type != null">
+        </if>
+        <if test="type != null">
             AND type = #{type}
         </if>
         <if test="parentId != null and parentId != 0">
@@ -112,30 +113,35 @@
                d.orgid,
                d.his_dept_id,
                d.his_parent_id
-               (select dept_name from sys_dept where dept_id = d.parent_id) parent_name
+                   (select dept_name from sys_dept where dept_id = d.parent_id) parent_name
         from sys_dept d
         where d.dept_id = #{deptId}
     </select>
 
     <select id="selectDeptByCode" parameterType="string" resultMap="SysDeptResult">
         select d.dept_id,
-               d.parent_id,
-               d.type,
-               d.dept_code,
-               d.dept_type,
-               d.ancestors,
-               d.dept_name,
-               d.order_num,
-               d.leader,
-               d.phone,
-               d.email,
-               d.orgid,
-               d.his_dept_id,
-               d.his_parent_id
-               d.status
+        d.parent_id,
+        d.type,
+        d.dept_code,
+        d.dept_type,
+        d.ancestors,
+        d.dept_name,
+        d.order_num,
+        d.leader,
+        d.phone,
+        d.email,
+        d.orgid,
+        d.his_dept_id,
+        d.his_parent_id,
+        d.status
         from sys_dept d
         where del_flag = 0
-          and d.dept_code = #{deptCode}
+        <if test="deptCode != null and deptCode != ''">
+            AND dept_code = #{deptCode}
+        </if>
+        <if test="orgid != null and orgid != ''">
+            AND orgid = #{orgid}
+        </if>
     </select>
 
     <select id="checkDeptExistUser" parameterType="Long" resultType="int">
@@ -170,6 +176,53 @@
         <include refid="selectDeptVo"/>
         where dept_name=#{deptName} and parent_id = #{parentId} and del_flag = '0' limit 1
     </select>
+
+
+    <insert id="batchDept">
+        insert into sys_dept(
+        dept_id,
+        parent_id,
+        dept_name,
+        ancestors,
+        order_num,
+        leader,
+        phone,
+        email,
+        status,
+        dept_code,
+        dept_type,
+        create_by,
+        his_dept_id,
+        his_parent_id,
+        type,
+        guid,
+        orgid,
+        create_time
+        ) values
+        <foreach collection="list" item="item" separator=",">
+            (
+            #{item.deptId},
+            #{item.parentId},
+            #{item.deptName},
+            #{item.ancestors},
+            #{item.orderNum},
+            #{item.leader},
+            #{item.phone},
+            #{item.email},
+            #{item.status},
+            #{item.deptCode},
+            #{item.deptType},
+            #{item.createBy},
+            #{item.hisDeptId},
+            #{item.hisParentId},
+            #{item.type},
+            #{item.guid},
+            #{item.orgid},
+            now()
+            )
+        </foreach>
+    </insert>
+
 
     <insert id="insertDept" parameterType="com.ruoyi.common.core.domain.entity.SysDept">
         insert into sys_dept(
@@ -258,7 +311,7 @@
 
     <delete id="deleteDeptById" parameterType="Long">
         update sys_dept
-        set del_flag = '2'
+        set del_flag = '1'
         where dept_id = #{deptId}
     </delete>
 

--
Gitblit v1.9.3