From 68c92dc86cc15ca8d4982a73e7404bd479f2232c Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期二, 22 十一月 2022 17:20:28 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/controller/portal/UmsWebsitePortalController.java | 2 --
ycl-platform/src/main/resources/mapper/message/MessageColumnSetMapper.xml | 10 +++++-----
ycl-platform/src/main/java/com/ycl/vo/message/MessageColumnSetVO.java | 4 ++--
3 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/portal/UmsWebsitePortalController.java b/ycl-platform/src/main/java/com/ycl/controller/portal/UmsWebsitePortalController.java
index 05f65ea..1aeab86 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/portal/UmsWebsitePortalController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/portal/UmsWebsitePortalController.java
@@ -56,14 +56,12 @@
@ApiOperation("logo绠＄悊-鏌ヨlogo")
@GetMapping("/logo/search")
- @LogSave(operationType = "闂ㄦ埛绠＄悊", contain = "鏌ヨlogo")
public CommonResult searchLogo() {
return CommonResult.success(umsWebsiteLogoService.list(new QueryWrapper<>()).get(0));
}
@ApiOperation("logo绠＄悊-鏌ヨlogo")
@GetMapping("/logo/searchOne")
- @LogSave(operationType = "闂ㄦ埛绠＄悊", contain = "鏌ヨlogo")
public CommonResult searchLogo(@RequestParam Integer id) {
return CommonResult.success(umsWebsiteLogoService.getOne(new QueryWrapper<WebsiteLogo>().eq("id", id)));
}
diff --git a/ycl-platform/src/main/java/com/ycl/vo/message/MessageColumnSetVO.java b/ycl-platform/src/main/java/com/ycl/vo/message/MessageColumnSetVO.java
index 371db17..08ab779 100644
--- a/ycl-platform/src/main/java/com/ycl/vo/message/MessageColumnSetVO.java
+++ b/ycl-platform/src/main/java/com/ycl/vo/message/MessageColumnSetVO.java
@@ -8,9 +8,9 @@
@ApiModel
public class MessageColumnSetVO {
- @ApiModelProperty(value = "娑堟伅鏍忕洰Id")
+ @ApiModelProperty(value = "鏍忕洰鍚嶇О")
private String columnName;
- @ApiModelProperty(value = "鏄惁鎺ユ敹0-涓嶆帴鏀�1-鎺ユ敹")
+ @ApiModelProperty(value = "娑堟伅鏁扮洰")
private Integer messageNumber;
}
diff --git a/ycl-platform/src/main/resources/mapper/message/MessageColumnSetMapper.xml b/ycl-platform/src/main/resources/mapper/message/MessageColumnSetMapper.xml
index 460aee3..b28bcaa 100644
--- a/ycl-platform/src/main/resources/mapper/message/MessageColumnSetMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/message/MessageColumnSetMapper.xml
@@ -18,20 +18,20 @@
<select id="selectColumnAndCount" resultType="com.ycl.vo.message.MessageColumnSetVO" >
SELECT
count(1) as messageNumber,
- t2.column_name AS columnName
+ t4.column_name AS columnName
FROM
`ums_message_column_set` t1
- LEFT JOIN ums_message_column t2 ON t1.message_column_id = t2.id
+ LEFT JOIN ums_message_column_set t2 ON t1.message_column_id = t2.id
+ LEFT JOIN ums_message_column t4 ON t2.message_column_id = t4.id
LEFT JOIN ums_message t3 ON t2.id=t3.message_type
<where>
t2.is_receive=1
- <if test="userId !null">
+ <if test="userId !=null">
and t1.user_id = #{userId}
</if>
</where>
GROUP BY
- t2.column_name
-
+ t4.column_name
</select>
</mapper>
--
Gitblit v1.8.0