zhanghua
2022-11-22 68c92dc86cc15ca8d4982a73e7404bd479f2232c
Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
3个文件已修改
16 ■■■■■ 已修改文件
ycl-platform/src/main/java/com/ycl/controller/portal/UmsWebsitePortalController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/vo/message/MessageColumnSetVO.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/resources/mapper/message/MessageColumnSetMapper.xml 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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)));
    }
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;
}
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>