From 0d60b1983ea908b81a0ce5f9a4ecc2fba1c00c4e Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期六, 15 十月 2022 15:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/db/gen/entity/TransactionEvent.java | 6 ++++++
flower_city/src/main/java/com/dg/core/controller/OrganizationController.java | 2 +-
flower_city/src/main/resources/mapper/TransactionEventMapper.xml | 4 +++-
flower_city/src/main/java/com/dg/core/db/gen/entity/OrganizationChartEntity.java | 2 +-
4 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/OrganizationController.java b/flower_city/src/main/java/com/dg/core/controller/OrganizationController.java
index de7cf8c..2b59286 100644
--- a/flower_city/src/main/java/com/dg/core/controller/OrganizationController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/OrganizationController.java
@@ -80,7 +80,7 @@
public ResultData updateConfig(@RequestBody OrganizationChartEntity entity,@CurrentUser SysUser sysUser)
{
entity.setUpdateTime(LocalDateTime.now());
- entity.setUpdateUserId(Integer.parseInt(String.valueOf(sysUser.getUserId())));
+ entity.setUpdateUserId(sysUser.getUserId());
return toAjax(iOrganizationChartService.updateConfig(entity));
}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/OrganizationChartEntity.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/OrganizationChartEntity.java
index b0e0190..3c7a142 100644
--- a/flower_city/src/main/java/com/dg/core/db/gen/entity/OrganizationChartEntity.java
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/OrganizationChartEntity.java
@@ -114,7 +114,7 @@
* 修改人
*/
@ApiModelProperty("修改人")
- private Integer updateUserId;
+ private Long updateUserId;
/**
* 修改人
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/TransactionEvent.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/TransactionEvent.java
index 85b7c7c..a794789 100644
--- a/flower_city/src/main/java/com/dg/core/db/gen/entity/TransactionEvent.java
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/TransactionEvent.java
@@ -39,6 +39,12 @@
@ApiModelProperty("部门所属区域")
private String departmentArea;
+ /**
+ * 部门电话
+ */
+ @ApiModelProperty("部门电话")
+ private String contactNumber;
+
/**
* 分类id
*/
diff --git a/flower_city/src/main/resources/mapper/TransactionEventMapper.xml b/flower_city/src/main/resources/mapper/TransactionEventMapper.xml
index 2b65b88..7d7bcca 100644
--- a/flower_city/src/main/resources/mapper/TransactionEventMapper.xml
+++ b/flower_city/src/main/resources/mapper/TransactionEventMapper.xml
@@ -51,7 +51,9 @@
SELECT
id,
department_id,
- department_area,
+ (select detailed_address from automessage_organization_chart
+ where automessage_organization_chart.id=department_id) department_area,
+ (select contact_number from automessage_organization_chart where automessage_organization_chart.id=department_id) as contactNumber,
classify_id,
matter_name,
associate_ids,
--
Gitblit v1.7.1