From 9e47ca901301d0a7af9bdfe49e9845ee07f5f456 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期四, 12 六月 2025 14:46:09 +0800
Subject: [PATCH] 部分功能调整
---
multi-system/src/main/resources/mapper/system/SysDeptMapper.xml | 69 ++++++++++++++++++++++++----------
1 files changed, 49 insertions(+), 20 deletions(-)
diff --git a/multi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/multi-system/src/main/resources/mapper/system/SysDeptMapper.xml
index 8085f33..25c1557 100644
--- a/multi-system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/multi-system/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -7,12 +7,12 @@
<resultMap type="com.gkhy.exam.common.domain.entity.SysDept" id="SysDeptResult">
<id property="deptId" column="dept_id" />
<result property="parentId" column="parent_id" />
+ <result property="companyId" column="company_id" />
<result property="ancestors" column="ancestors" />
<result property="deptName" column="dept_name" />
<result property="orderNum" column="order_num" />
- <result property="leader" column="leader" />
- <result property="phone" column="phone" />
- <result property="email" column="email" />
+ <result property="leaderUserId" column="leader_user_id" />
+ <result property="leaderName" column="leader_name" />
<result property="status" column="status" />
<result property="delFlag" column="del_flag" />
<result property="parentName" column="parent_name" />
@@ -20,16 +20,35 @@
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
+ <result property="responsibilities" column="responsibilities" />
+ <result property="personNum" column="person_num" />
+ <result property="internalAuditors" column="internal_auditors" />
+ <result property="internalAuditorsName" column="internal_auditors_name" />
+ </resultMap>
+ <resultMap type="com.gkhy.exam.system.domain.vo.DeptVo" id="DeptVoResult" extends="SysDeptResult">
+ <collection property="caluseVO1List" ofType="com.gkhy.exam.system.domain.vo.CaluseVO1">
+ <id property="clauseNum" column="clause_num" />
+ <result property="content" column="content" />
+ </collection>
</resultMap>
<sql id="selectDeptVo">
- select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time
+ select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader_user_id, d.company_id, d.status, d.del_flag, d.create_by, d.create_time,d.person_num,d.internal_auditors,
+ d.responsibilities
from sys_dept d
</sql>
- <select id="selectDeptList" parameterType="com.gkhy.exam.common.domain.entity.SysDept" resultMap="SysDeptResult">
- <include refid="selectDeptVo"/>
+ <select id="selectDeptList" parameterType="com.gkhy.exam.common.domain.entity.SysDept" resultMap="DeptVoResult">
+ select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader_user_id, d.company_id, d.status, d.del_flag, d.create_by, d.create_time,d.person_num,d.internal_auditors,
+ d.responsibilities,u.name as leader_name,d2.dept_name as parent_name, dr.content ,dr.clause_num
+ from sys_dept d
+ left join sys_user u on d.leader_user_id = u.user_id
+ left join sys_dept d2 on d.parent_id = d2.dept_id
+ left join sys_dept_responsibility dr on d.dept_id = dr.dept_id and dr.del_flag = '0' and data_type = 2
where d.del_flag = '0'
+ <if test="companyId != null and companyId != 0">
+ AND company_id = #{companyId}
+ </if>
<if test="deptId != null and deptId != 0">
AND dept_id = #{deptId}
</if>
@@ -42,8 +61,6 @@
<if test="status != null and status != ''">
AND status = #{status}
</if>
- <!-- 数据范围过滤 -->
- ${params.dataScope}
order by d.parent_id, d.order_num
</select>
@@ -51,6 +68,9 @@
<select id="getOutDeptList" parameterType="com.gkhy.exam.common.domain.entity.SysDept" resultMap="SysDeptResult">
<include refid="selectDeptVo"/>
where d.del_flag = '0'
+ <if test="companyId != null and companyId != 0">
+ AND company_id = #{companyId}
+ </if>
<if test="deptId != null and deptId != 0">
AND dept_id = #{deptId}
</if>
@@ -79,8 +99,10 @@
</select>
<select id="selectDeptById" parameterType="Long" resultMap="SysDeptResult">
- select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status,
- (select dept_name from sys_dept where dept_id = d.parent_id) parent_name
+ select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader_user_id,d.company_id,d.status,d.person_num,d.internal_auditors,
+ d.responsibilities,
+ (select dept_name from sys_dept where dept_id = d.parent_id) parent_name,(select dept_name from sys_user where id = d.leader_user_id) leader_name
+ ,(select dept_name from sys_user where id = d.internal_auditors) internal_auditors_name
from sys_dept d
where d.dept_id = #{deptId}
</select>
@@ -104,7 +126,9 @@
<select id="checkDeptNameUnique" resultMap="SysDeptResult">
<include refid="selectDeptVo"/>
- where dept_name=#{deptName} and parent_id = #{parentId} and del_flag = '0' limit 1
+ where dept_name=#{deptName} and parent_id = #{parentId}
+ and company_id = #{companyId}
+ and del_flag = '0' limit 1
</select>
<insert id="insertDept" parameterType="com.gkhy.exam.common.domain.entity.SysDept">
@@ -114,9 +138,11 @@
<if test="deptName != null and deptName != ''">dept_name,</if>
<if test="ancestors != null and ancestors != ''">ancestors,</if>
<if test="orderNum != null">order_num,</if>
- <if test="leader != null and leader != ''">leader,</if>
- <if test="phone != null and phone != ''">phone,</if>
- <if test="email != null and email != ''">email,</if>
+ <if test="leaderUserId != null ">leader_user_id,</if>
+ <if test="companyId != null ">company_id,</if>
+ <if test="personNum != null">person_num,</if>
+ <if test="internalAuditors != null">internal_auditors,</if>
+ <if test="responsibilities != null and responsibilities != ''">responsibilities,</if>
<if test="status != null">status,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
create_time
@@ -126,9 +152,11 @@
<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>
- <if test="phone != null and phone != ''">#{phone},</if>
- <if test="email != null and email != ''">#{email},</if>
+ <if test="leaderUserId != null">#{leaderUserId},</if>
+ <if test="companyId != null ">#{companyId},</if>
+ <if test="personNum != null">#{personNum},</if>
+ <if test="internalAuditors != null">#{internalAuditors},</if>
+ <if test="responsibilities != null and responsibilities != ''">#{responsibilities},</if>
<if test="status != null">#{status},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
sysdate()
@@ -142,9 +170,10 @@
<if test="deptName != null and deptName != ''">dept_name = #{deptName},</if>
<if test="ancestors != null and ancestors != ''">ancestors = #{ancestors},</if>
<if test="orderNum != null">order_num = #{orderNum},</if>
- <if test="leader != null">leader = #{leader},</if>
- <if test="phone != null">phone = #{phone},</if>
- <if test="email != null">email = #{email},</if>
+ <if test="leaderUserId != null">leader_user_id = #{leaderUserId},</if>
+ <if test="personNum != null">person_num = #{personNum},</if>
+ <if test="internalAuditors != null">internal_auditors = #{internalAuditors},</if>
+ <if test="responsibilities != null and responsibilities != ''">responsibilities = #{responsibilities},</if>
<if test="status != null and status != ''">status = #{status},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
update_time = sysdate()
--
Gitblit v1.9.2