From 473dee8739de376e54bef5bbfbdd0f45eca38e9a Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期三, 16 十一月 2022 10:57:33 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into zigonggao_dev
---
flower_city/src/main/resources/mapper/SysUserMapper.xml | 5 +++++
flower_city/src/main/java/com/dg/core/db/gen/entity/SysUser.java | 4 ++++
flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java | 8 ++++----
3 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java b/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java
index 22a806a..1478f5d 100644
--- a/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java
@@ -92,12 +92,12 @@
@ApiOperation("根据部门id获取导办事物列表")
@GetMapping("/department/getList")
@Authorization
- public TableDataInfo<TransactionEvent> selectConfigList(@RequestParam(value = "DepartmentId",required = false) String DepartmentId,
+ public TableDataInfo<TransactionEvent> selectConfigList(@RequestParam(value = "DepartmentId",required = false) List<String> DepartmentId,
@CurrentUser SysUser sysUser)
{
- List<String> ids=iOrganizationChartService.getIds(DepartmentId);
- List<TransactionEvent> list = iTransactionEventService.selectConfigList(null,null,ids);
- int num=iTransactionEventService.countNum(null,null,ids);
+// List<String> ids=iOrganizationChartService.getIds(DepartmentId);
+ List<TransactionEvent> list = iTransactionEventService.selectConfigList(null,null,DepartmentId);
+ int num=iTransactionEventService.countNum(null,null,DepartmentId);
return getDataTable(list,num);
}
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 6a7381e..1a1eb79 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
@@ -264,6 +264,10 @@
private String mattersIds;
+ @ApiModelProperty("部门ids")
+ private String departmentIds;
+
+
@TableField(exist = false)
@ApiModelProperty("办理事项名称")
private String mattersNames;
diff --git a/flower_city/src/main/resources/mapper/SysUserMapper.xml b/flower_city/src/main/resources/mapper/SysUserMapper.xml
index 32c93fe..38904be 100644
--- a/flower_city/src/main/resources/mapper/SysUserMapper.xml
+++ b/flower_city/src/main/resources/mapper/SysUserMapper.xml
@@ -38,6 +38,7 @@
<result property="transactionNum" column="transaction_num" />
<result property="isDivisionHead" column="is_division_head" />
<result property="mattersIds" column="matters_ids" />
+ <result property="departmentIds" column="department_ids" />
</resultMap>
<sql id="selectSysUserVo">
@@ -68,6 +69,7 @@
stair_id,
second_level_id,
matters_ids,
+ department_ids,
(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
@@ -252,6 +254,7 @@
<if test="openid != null and openid != '' ">,openid</if>
<if test="isDivisionHead != null and isDivisionHead != '' ">,is_division_head</if>
<if test="mattersIds != null ">,matters_ids</if>
+ <if test="departmentIds != null ">,department_ids</if>
)values(
sysdate()
<if test="userId != null and userId != '' ">,#{userId}</if>
@@ -287,6 +290,7 @@
<if test="openid != null and openid != '' ">,#{openid}</if>
<if test="isDivisionHead != null and isDivisionHead != '' ">,#{isDivisionHead}</if>
<if test="mattersIds != null">,#{mattersIds}</if>
+ <if test="departmentIds != null ">,#{departmentIds}</if>
)
</insert>
@@ -326,6 +330,7 @@
<if test="openid != null and openid != '' ">,openid=#{openid}</if>
<if test="isDivisionHead != null and isDivisionHead != '' ">,is_division_head=#{isDivisionHead}</if>
<if test="mattersIds != null">,matters_ids=#{mattersIds}</if>
+ <if test="departmentIds != null ">,department_ids=#{departmentIds}</if>
,update_time=sysdate()
</set>
where user_id= #{userId}
--
Gitblit v1.7.1