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 | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 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 9946281..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,9 +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.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;
@@ -379,4 +377,25 @@
return partyBuildingService.userCertification(userId);
}
+
+ @ApiOperation(value = "获取用户电子档案",response = UserArchivesVO.class)
+ @PostMapping("getUserArchives")
+ public R getUserArchives() {
+ Long userId = this.getUserId();
+ if(userId == null){
+ return R.fail("请重新登录");
+ }
+ return userService.getUserArchives(userId);
+ }
+
+ @ApiOperation(value = "编辑用户电子档案")
+ @PostMapping("updateUserArchives")
+ public R updateUserArchives(@RequestBody UpdateUserArchivesVO userArchivesVO) {
+ Long userId = this.getUserId();
+ if(userId == null){
+ return R.fail("请重新登录");
+ }
+ userArchivesVO.setUserId(userId);
+ return userService.updateUserArchives(userArchivesVO);
+ }
}
--
Gitblit v1.7.1