From 6381bb6b6422c23ee4801895019f1a432903fbe8 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 10 七月 2025 14:58:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
smartor/src/main/resources/mapper/smartor/SysDeptMapper.xml | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 51 insertions(+), 3 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/SysDeptMapper.xml b/smartor/src/main/resources/mapper/smartor/SysDeptMapper.xml
index 13bd562..089aa5e 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,7 +113,7 @@
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>
@@ -132,7 +133,7 @@
d.orgid,
d.his_dept_id,
d.his_parent_id
- d.status
+ d.status
from sys_dept d
where del_flag = 0
and d.dept_code = #{deptCode}
@@ -171,6 +172,53 @@
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(
<if test="deptId != null and deptId != 0">dept_id,</if>
--
Gitblit v1.9.3