From 6c4db89ea8795d6be8431f698051e62bec9ec956 Mon Sep 17 00:00:00 2001
From: 罗yu 元桥 <2376770955@qq.com>
Date: 星期五, 07 五月 2021 09:06:08 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 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 4d57485..5138225 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
@@ -246,7 +246,8 @@
"u.continuous_landing_days + 1,\n" +
"0)")
int timedTaskContinuousLandingDays();
- @Select("select state from com_mng_volunteer_mng where phone=#{phone} order by create_at desc limit 1")
+ @Select("select id,create_at,state,name,phone,photo_path,political_face,reject_reson,apply_reson,address,age,job,integral,community_id,submit_user_id " +
+ " from com_mng_volunteer_mng where phone=#{phone} order by create_at desc limit 1")
ComMngVolunteerMngVO selectVolunteerMngByPhone(String phone);
@Update("update sys_user set face_state=null where user_id=#{userId}")
int updateFaceState(Long userId);
@@ -355,4 +356,10 @@
" where user_id = #{userArchivesVO.userId}")
void updateUserArchives(@Param("userArchivesVO") UpdateUserArchivesVO userArchivesVO);
+ @Select("update com_pb_member set user_id = #{userId} where audit_result = 1 and id_card = #{idCard}")
+ void updateComPbMemberUserId(@Param("idCard")String idCard, @Param("userId")Long userId);
+
+ @Select("select id from com_pb_member where audit_result = 1 and id_card = #{idCard}")
+ Long getPartyBuildingByIdCard(@Param("idCard")String idCard);
+
}
--
Gitblit v1.7.1