From d2fe6196f1991d10b48adf2debf8521b34f4c461 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期二, 27 四月 2021 10:04:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java | 7 ++-----
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java | 6 +++---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/UpdateUserArchivesVO.java | 2 +-
3 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
index 1871ce0..f425801 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
@@ -8,10 +8,7 @@
import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.partybuilding.PartyBuildingMemberVO;
-import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
-import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
-import com.panzhihua.common.model.vos.user.UpdateUserArchivesVO;
-import com.panzhihua.common.model.vos.user.UserPhoneVO;
+import com.panzhihua.common.model.vos.user.*;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.partybuilding.PartyBuildingService;
import com.panzhihua.common.service.user.UserService;
@@ -381,7 +378,7 @@
}
- @ApiOperation(value = "获取用户电子档案")
+ @ApiOperation(value = "获取用户电子档案",response = UserArchivesVO.class)
@PostMapping("getUserArchives")
public R getUserArchives() {
Long userId = this.getUserId();
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/UpdateUserArchivesVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/UpdateUserArchivesVO.java
index 5f92ae8..a8289cc 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/UpdateUserArchivesVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/UpdateUserArchivesVO.java
@@ -11,7 +11,7 @@
@ApiModel("修改用户电子档案")
@Data
public class UpdateUserArchivesVO {
- @ApiModelProperty(value = "用户id",hidden = false)
+ @ApiModelProperty(value = "用户id",hidden = true)
private Long userId;
@ApiModelProperty("证件照（人像面）照片")
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 26e414b..fdb8c3d 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
@@ -349,9 +349,9 @@
void deleteStoreByPhoneAndStatus(@RequestParam("phone") String phone);
@Select("update sys_user set" +
- " card_photo_front = #{userArchivesVO.cardPhotoFront}" +
- "and card_photo_back = #{userArchivesVO.cardPhotoBack}" +
- "and family_book = #{userArchivesVO.familyBook}" +
+ " 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