CeDo
2021-04-28 1c9cb25e52ebdd60a2ad9c7d3e15df3e25029152
bugfixed:78756
2个文件已修改
11 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideVO.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserFeedbackDAO.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideVO.java
@@ -7,6 +7,7 @@
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.List;
@@ -21,7 +22,7 @@
    private Long id;
    @ApiModelProperty("办事指南标题")
    @NotNull(groups = {AddGroup.class}, message = "标题不能为空")
    @NotBlank(groups = {AddGroup.class}, message = "标题不能为空")
    @Length(groups = {AddGroup.class}, max = 35)
    private String title;
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserFeedbackDAO.java
@@ -40,7 +40,9 @@
            "f.photo_path,\n" +
            "c.name communityName\n" +
            "from sys_user_feedback f\n" +
            "join sys_user u on f.user_id=u.user_id\n" +
            "left join sys_user u on f.user_id=u.user_id\n" +
            "left join com_act c on u.community_id=c.community_id\n" +
            "<where>" +
            "<if test='pageFeedBackDTO.phone != null and pageFeedBackDTO.phone.trim() != &quot;&quot;'>" +
            "and u.phone=#{pageFeedBackDTO.phone}\n" +
            " </if> " +
@@ -48,9 +50,9 @@
            "and u.name like concat('%',#{pageFeedBackDTO.name},'%')   \n" +
            " </if> " +
            "<if test='pageFeedBackDTO.nickName != null and pageFeedBackDTO.nickName.trim() != &quot;&quot;'>" +
            "and u.nick_name=like concat('%',#{pageFeedBackDTO.nickName},'%') \n" +
            "and u.nick_name like concat('%',#{pageFeedBackDTO.nickName},'%') \n" +
            " </if> " +
            "join com_act c on u.community_id=c.community_id\n" +
            "</where> " +
            "order by f.create_at desc\n" +
            "</script>")
    IPage<SysUserFeedbackVO> pageFeedback(Page page, @Param("pageFeedBackDTO") PageFeedBackDTO pageFeedBackDTO);