From a7002e25ec105e5f73c27f91944f1c0b4991c355 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期四, 30 十二月 2021 14:23:41 +0800
Subject: [PATCH] Merge branch 'master' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComBpActivityDAO.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComBpActivityDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComBpActivityDAO.java
index f6323a9..cab1dd7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComBpActivityDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComBpActivityDAO.java
@@ -47,7 +47,7 @@
+ "a.activity_time_begin,\n" + "a.activity_time_end,\n" + "a.enroll_time_begin,\n" + "a.cover,\n"
+ "if(u.type=3 ,'管理员',u.name)createByName,\n" + "a.enroll_time_end \n" + "FROM\n" + "com_pb_activity a\n"
+ "left join sys_user u on a.create_by=u.user_id \n"
- + "where a.community_id = #{partyBuildingActivityVO.communityId}\n"
+ + "where a.community_id = ${partyBuildingActivityVO.communityId}\n"
+ "<if test='partyBuildingActivityVO.name != null and partyBuildingActivityVO.name.trim() != ""'>"
+ "and a.name = #{partyBuildingActivityVO.name} \n" + " </if> "
+ "<if test='partyBuildingActivityVO.isAppliets != null and partyBuildingActivityVO.isAppliets==1'>"
@@ -106,6 +106,6 @@
* 社区id
* @return 社区名字
*/
- @Select("select name from com_act where community_id = #{communityId}")
+ @Select("select name from com_act where community_id = ${communityId}")
String selectCommunityNameByCommunityId(Long communityId);
}
--
Gitblit v1.7.1