From b0bf1e22362371b49ab4827ef89da521b7bbb46f Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期五, 18 十一月 2022 16:18:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/resources/mapper/SysUserMapper.xml | 8 +++++---
flower_city/src/main/java/com/dg/core/db/gen/entity/SysUser.java | 6 ++++++
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/SysUser.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/SysUser.java
index 7801325..54f3e05 100644
--- a/flower_city/src/main/java/com/dg/core/db/gen/entity/SysUser.java
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/SysUser.java
@@ -164,6 +164,12 @@
@ApiModelProperty("角色id")
private String roleIds;
+ /**
+ * 前端使用
+ */
+ @ApiModelProperty("前端使用")
+ private String departmentIdStr;
+
/**
* 数据权限
*/
diff --git a/flower_city/src/main/resources/mapper/SysUserMapper.xml b/flower_city/src/main/resources/mapper/SysUserMapper.xml
index 9bfcd5e..c2bbdf3 100644
--- a/flower_city/src/main/resources/mapper/SysUserMapper.xml
+++ b/flower_city/src/main/resources/mapper/SysUserMapper.xml
@@ -40,6 +40,7 @@
<result property="mattersIds" column="matters_ids" />
<result property="departmentIds" column="department_ids" />
<result property="moreDepartmentIds" column="more_department_ids" />
+ <result property="departmentIdStr" column="department_id_str" />
</resultMap>
<sql id="selectSysUserVo">
@@ -72,6 +73,7 @@
matters_ids,
department_ids,
more_department_ids,
+ department_id_str,
(SELECT GROUP_CONCAT(matter_name) FROM automessage_transaction_event WHERE id in (SELECT
substring_index(substring_index(matters_ids,',', b.help_topic_id + 1), ',', -1) result
FROM
@@ -178,7 +180,6 @@
order by create_time desc
</select>
-
<select id="selectData" parameterType="string" resultMap="SysUserResult">
<include refid="selectSysUserVo"/>
<where>
@@ -206,7 +207,6 @@
</where>
</select>
-
<select id="selectListByDepartmentId" resultMap="SysUserResult">
<include refid="selectSysUserVo"/>
<where>
@@ -224,7 +224,6 @@
</where>
order by transaction_num
</select>
-
<insert id="insertConfig" parameterType="com.dg.core.db.gen.entity.SysUser">
insert ignore into automessage_sys_user (
@@ -264,6 +263,7 @@
<if test="mattersIds != null ">,matters_ids</if>
<if test="departmentIds != null ">,department_ids</if>
<if test="moreDepartmentIds != null ">,more_department_ids</if>
+ <if test="departmentIdStr != null ">,department_id_str</if>
)values(
sysdate()
<if test="userId != null and userId != '' ">,#{userId}</if>
@@ -301,6 +301,7 @@
<if test="mattersIds != null">,#{mattersIds}</if>
<if test="departmentIds != null ">,#{departmentIds}</if>
<if test="moreDepartmentIds != null ">,#{moreDepartmentIds}</if>
+ <if test="departmentIdStr != null ">,#{departmentIdStr}</if>
)
</insert>
@@ -342,6 +343,7 @@
<if test="mattersIds != null">,matters_ids=#{mattersIds}</if>
<if test="departmentIds != null ">,department_ids=#{departmentIds}</if>
<if test="moreDepartmentIds != null ">,more_department_ids=#{moreDepartmentIds}</if>
+ <if test="departmentIdStr != null ">,department_id_str=#{departmentIdStr}</if>
,update_time=sysdate()
</set>
where user_id= #{userId}
--
Gitblit v1.7.1