From f721ee13dc5f95f607bb25b09f73cae6a7123ed9 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期六, 17 四月 2021 17:56:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java |   33 +++++++++++++++++++++++----------
 1 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java
index bb653af..eb8b247 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java
@@ -9,6 +9,7 @@
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
 
@@ -50,19 +51,31 @@
             " </if> " +
             "</script>")
     List<ComActVO> listCommunity(ComActVO comActVO);
+
     @Select("select district_name from com_mng_struct_area_district where district_adcode=#{areaCode}")
     String selectAreaName(String areaCode);
 
     @Select("<script> " +
-            "select id,"+
-        " <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\n" +
+            "a.* \n" +
+            "FROM\n" +
+            "com_act a \n" +
+            " <where>" +
+            "<if test='pageComActDTO.name != null and pageComActDTO.name.trim() != &quot;&quot;'>" +
+            "and a.name LIKE concat( #{pageComActDTO.name}, '%' ) \n" +
+            " </if> " +
+            "<if test='pageComActDTO.areaCode != null and pageComActDTO.areaCode.trim() != &quot;&quot;'>" +
+            "AND a.area_code = #{pageComActDTO.areaCode} \n" +
+            " </if> " +
+            "<if test='pageComActDTO.createAtBegin != null '>" +
+            "AND a.create_at BETWEEN " +
+            "#{pageComActDTO.createAtBegin} \n" +
+            "AND #{pageComActDTO.createAtEnd}" +
+            " </if> " +
+            " </where>" +
+            " order by a.create_at desc"+
+            "</script>")
     IPage<ComActVO> pageCommunity(Page page, @Param("pageComActDTO") PageComActDTO pageComActDTO);
+    @Update("update sys_user u set u.password=#{password} where u.account=#{account} and u.type=3 and u.community_id=#{communityId}")
+    void updateAccountPassword(@Param("password") String password, @Param("account") String account, @Param("communityId")Long communityId);
 }

--
Gitblit v1.7.1