From fc36338476ccb0e8fa641794de4022f300f59a2e Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 16 七月 2024 13:59:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/UserDepartmentMapper.xml | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/UserDepartmentMapper.xml b/src/main/resources/mapper/UserDepartmentMapper.xml
index a2f68c8..3fb4a0d 100644
--- a/src/main/resources/mapper/UserDepartmentMapper.xml
+++ b/src/main/resources/mapper/UserDepartmentMapper.xml
@@ -7,13 +7,13 @@
<result column="department_id" jdbcType="INTEGER" property="departmentId" />
</resultMap>
<sql id="Base_Column_List">
- id, user_id, department_id
+ id, user_id, department_id, dept_admin
</sql>
<insert id="insert" parameterType="com.mindskip.xzs.domain.UserDepartment" useGeneratedKeys="true" keyProperty="id">
- insert into t_user_department (id, user_id, department_id
+ insert into t_user_department (id, user_id, department_id, dept_admin
)
- values (#{id,jdbcType=INTEGER}, #{userId,jdbcType=INTEGER}, #{departmentId,jdbcType=INTEGER}
+ values (#{id,jdbcType=INTEGER}, #{userId,jdbcType=INTEGER}, #{departmentId,jdbcType=INTEGER}, #{deptAdmin}
)
</insert>
@@ -32,6 +32,13 @@
where user_id = #{userId,jdbcType=INTEGER}
</select>
+ <select id="selectDeptByUserId" resultType="com.mindskip.xzs.domain.Department">
+ SELECT
+ d.id,d.name
+ FROM t_user_department ud INNER JOIN t_department d ON ud.department_id = d.id
+ WHERE ud.user_id = #{userId} AND d.deleted = 0
+ </select>
+
<select id="selectByDepartmentId" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
--
Gitblit v1.8.0