springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java
@@ -68,7 +68,7 @@ @ApiModelProperty("性别 1 男 2 女") private Integer sex; @ApiModelProperty("是否社区团队或者党委或系统管理人员 1 是 2 否") @ApiModelProperty("是否本社区的团队或者党委、或是系统管理人员 1 是 2 否") private Integer ismemberrole; @ApiModelProperty("生日") 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() != ""'>" + "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() != ""'>" + "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);