From b200b681bc401bb11c133a79273ba78cb6ebedf8 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 30 七月 2021 18:16:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
index 27b094b..c5b6c75 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
@@ -414,7 +414,7 @@
@Update("update lc_compare_code_member set local_grid_member_id = #{userId},grid_member_name = #{userName} where id = #{lcMemberId}")
void addLcMember(@Param("lcMemberId") Long lcMemberId,@Param("userId") Long userId,@Param("userName") String userName);
- @Update("update lc_compare_code_member set local_grid_member_id = null,grid_member_name = null where local_grid_member_id = #{gridMemberId}")
+ @Delete("delete from lc_compare_code_member where local_grid_member_id = #{gridMemberId}")
void delLcMember(@Param("gridMemberId") Long gridMemberId);
@Select("select id,village_id,act_id from com_mng_building where id = #{buildingId}")
@@ -423,8 +423,8 @@
@Delete("delete from event_grid_member_building_relation where grid_member_id = #{gridMemberId}")
void delGridMemberRelation(@Param("gridMemberId") Long gridMemberId);
- @Select("select id from lc_compare_code_member where local_grid_member_id = #{gridMemberId}")
- Long getLcMemberId(@Param("gridMemberId") Long gridMemberId);
+ @Select("select lc_grid_member_id,lc_grid_member_name,lc_bind_user_id from lc_compare_code_member where local_grid_member_id = #{gridMemberId}")
+ Map<String,String> getLcMemberId(@Param("gridMemberId") Long gridMemberId);
@Select("select count(id) from event_grid_member_relation where grid_member_id = #{userId}")
Integer getGridIsOk(@Param("userId") Long userId);
--
Gitblit v1.7.1