From 19b801af62236e7401ca6607b9c65181306e01b4 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期四, 17 十一月 2022 15:22:27 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java | 3 ++-
flower_city/src/main/resources/mapper/AutomessagePolicyDocumentsMapper.xml | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java b/flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java
index 2b1a29a..34d494f 100644
--- a/flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java
@@ -157,7 +157,7 @@
@ApiOperation("复制模板")
@PostMapping("/copy")
@Authorization
- public ResultData copy(@RequestParam(value = "Id",required = false) String Id)
+ public ResultData copy(@RequestParam(value = "Id",required = false) String Id,@CurrentUser SysUser sysUser)
{
if(StringUtils.isEmpty(Id))
{
@@ -170,6 +170,7 @@
{
return ResultData.error("模板不存在！");
}
+ entity.setCreateUserId(sysUser.getUserId());
entity.setName(entity.getName()+"(副本)");
entity.setId(null);
return toAjax(iReplyTemplateService.insertConfig(entity));
diff --git a/flower_city/src/main/resources/mapper/AutomessagePolicyDocumentsMapper.xml b/flower_city/src/main/resources/mapper/AutomessagePolicyDocumentsMapper.xml
index 62ac6bc..9c99e5e 100644
--- a/flower_city/src/main/resources/mapper/AutomessagePolicyDocumentsMapper.xml
+++ b/flower_city/src/main/resources/mapper/AutomessagePolicyDocumentsMapper.xml
@@ -48,7 +48,7 @@
and department_id in (SELECT id from automessage_organization_chart where id=#{departmentId} or parent_id = #{departmentId})
</if>
</where>
- order by create_time
+ order by create_time desc
</select>
<select id="selectCountList" resultType="integer">
--
Gitblit v1.7.1