From 302acda2c957091a878bd9e2cc35076554faa22e Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 07 七月 2021 15:19:06 +0800
Subject: [PATCH] 修改bug以及综治后台网格员与网格接口改动

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java
index cdd7231..7a12664 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java
@@ -83,6 +83,15 @@
             "<if test='comActEasyPhotoVO.sponsorId != null and comActEasyPhotoVO.sponsorId != 0'>" +
             "AND p.sponsor_id =#{comActEasyPhotoVO.sponsorId}  " +
             " </if> " +
+            "<if test='comActEasyPhotoVO.activityType != null'>" +
+            "AND p.activity_type =#{comActEasyPhotoVO.activityType}  " +
+            " </if> " +
+            "<if test='comActEasyPhotoVO.easyType != null and comActEasyPhotoVO.easyType == 1'>" +
+            " AND (p.status = 1 or (p.status > 1 and is_need_feed_back = 0)) " +
+            " </if> " +
+            "<if test='comActEasyPhotoVO.easyType != null and comActEasyPhotoVO.easyType == 2'>" +
+            " AND p.status > 1 and is_need_feed_back = 1 " +
+            " </if> " +
             "group by p.id "+
 
             "union all "+

--
Gitblit v1.7.1