From e4c64bf1edc05a164406778e9cfaa86744210d05 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 13 九月 2021 21:06:24 +0800
Subject: [PATCH] Merge branch 'test' into 'master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserFeedbackDAO.java |   26 +-------------------------
 1 files changed, 1 insertions(+), 25 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserFeedbackDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserFeedbackDAO.java
index 79982b5..c2dadaa 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserFeedbackDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserFeedbackDAO.java
@@ -2,7 +2,6 @@
 
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -19,32 +18,9 @@
  **/
 @Mapper
 public interface SysUserFeedbackDAO extends BaseMapper<SysUserFeedbackDO> {
-    // @Select("<script> " +
-    // " <where>" +
-    // "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
-    // " </if> " +
-    // "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
-    // " </if> " +
-    // "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
-    // " </if> " +
-    // " </where>" +
-    // "</script>")
 
-    @Select("<script> " + "select \n" + "u.name,\n" + "u.nick_name,\n" + "f.id,\n" + "u.phone,\n" + "f.create_at,\n"
-        + "f.content,\n" + "f.photo_path,\n" + "c.name communityName\n" + "from sys_user_feedback f\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 like concat('%',#{pageFeedBackDTO.phone},'%') \n" + " </if> "
-        + "<if test='pageFeedBackDTO.name != null and pageFeedBackDTO.name.trim() != &quot;&quot;'>"
-        + "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" + " </if> " + "</where> "
-        + "order by f.create_at desc\n" + "</script>")
     IPage<SysUserFeedbackVO> pageFeedback(Page page, @Param("pageFeedBackDTO") PageFeedBackDTO pageFeedBackDTO);
 
-    @Select("select \n" + "u.name,\n" + "u.nick_name,\n" + "f.id,\n" + "f.content,\n" + "f.photo_path,\n" + "u.phone,\n"
-        + "f.create_at,\n" + "c.name communityName\n" + "from sys_user_feedback f\n"
-        + "join sys_user u on f.user_id=u.user_id\n" + "join com_act c on u.community_id=c.community_id\n"
-        + "where f.id=#{id}\n")
+
     SysUserFeedbackVO detailFeedback(Long id);
 }

--
Gitblit v1.7.1