From b6082fe75b377ac9c177736d98f36ae46e7cdb70 Mon Sep 17 00:00:00 2001
From: 罗yu 元桥 <2376770955@qq.com>
Date: 星期三, 28 四月 2021 10:20:55 +0800
Subject: [PATCH] Merge branch 'master' into 'test'
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java | 18 +++++++++++++++++-
1 files changed, 17 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 2565426..996080b 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
@@ -16,12 +16,14 @@
import com.panzhihua.common.model.vos.user.AdministratorsUserVO;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
import com.panzhihua.common.model.vos.user.SysUserVO;
+import com.panzhihua.common.model.vos.user.UpdateUserArchivesVO;
import com.panzhihua.service_user.model.dos.SysUserDO;
import com.panzhihua.service_user.model.dtos.DataKanbanDTO;
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 org.springframework.web.bind.annotation.RequestParam;
import java.util.Date;
import java.util.List;
@@ -159,7 +161,7 @@
"from sys_user u\n" +
"left join com_act a on u.community_id=a.community_id\n" +
" where\n" +
- "u.type=1\n" +
+ "u.type=1 and u.community_id is not null \n" +
"<if test='pageUserAppletsBackstageDTO.phone != null and pageUserAppletsBackstageDTO.phone.trim() != ""'>" +
"and u.phone=#{pageUserAppletsBackstageDTO.phone}\n" +
" </if> " +
@@ -339,4 +341,18 @@
"\t LEFT JOIN sys_role r ON ur.role_id = r.role_id \n" +
"WHERE ur.role_id IS NOT NULL AND u.phone = #{phone} ")
Integer selectCountSysUser(@Param("phone")String phone);
+
+ @Select("update com_shop_store set sys_user_id = #{sysUserId} where phone = #{phone}")
+ void updateStoreByPhone(@Param("phone")String phone, @Param("sysUserId")Long sysUserId);
+
+ @Select("delete from com_shop_store where delete_status = 1 and phone = #{phone}")
+ void deleteStoreByPhoneAndStatus(@RequestParam("phone") String phone);
+
+ @Select("update sys_user set" +
+ " card_photo_front = #{userArchivesVO.cardPhotoFront} \n" +
+ ", card_photo_back = #{userArchivesVO.cardPhotoBack} \n" +
+ ",family_book = #{userArchivesVO.familyBook} \n" +
+ " where user_id = #{userArchivesVO.userId}")
+ void updateUserArchives(@Param("userArchivesVO") UpdateUserArchivesVO userArchivesVO);
+
}
--
Gitblit v1.7.1