From 8d9be764777d27c7abf395be5055cf2324bdde8f Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期三, 22 六月 2022 09:19:35 +0800
Subject: [PATCH] Merge branch 'dev'
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialWorkerApi.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialWorkerApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialWorkerApi.java
index 1d9f882..3b406c3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialWorkerApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialWorkerApi.java
@@ -5,6 +5,7 @@
import com.panzhihua.common.listen.ComActSocialWorkerExcelListen;
import com.panzhihua.common.model.dtos.civil.*;
import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.civil.ComActSocialWorkerDetailsVO;
import com.panzhihua.common.model.vos.civil.ComActSocialWorkerVO;
@@ -21,6 +22,9 @@
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.io.InputStream;
+
+import static java.util.Objects.isNull;
+import static java.util.Objects.nonNull;
/**
*
@@ -75,7 +79,12 @@
@ApiOperation(value = "查询社工", response= ComActSocialWorkerVO.class)
R query(@Validated @ModelAttribute PageComActSocialWorkerDTO pageComActSocialWorkerDTO){
ClazzUtils.setIfStringIsEmpty(pageComActSocialWorkerDTO);
- pageComActSocialWorkerDTO.setCommunityId(this.getCommunityId());
+ LoginUserInfoVO loginUserInfoSureNoLogin = this.getLoginUserInfoSureNoLogin();
+ if (nonNull(loginUserInfoSureNoLogin)) {
+ pageComActSocialWorkerDTO.setCommunityId(loginUserInfoSureNoLogin.getCommunityId());
+ } else if (isNull(pageComActSocialWorkerDTO.getCommunityId())) {
+ return R.fail("缺少社区id");
+ }
return communityService.queryComactsocialworker(pageComActSocialWorkerDTO);
}
@@ -98,7 +107,7 @@
*/
@GetMapping("/{id}")
@ApiOperation(value = "查询社工详细信息")
- R<ComActSocialWorkerDetailsVO> details(@PathVariable("id") Long id){
+ R<ComActSocialWorkerVO> details(@PathVariable("id") Long id){
return communityService.comActSocialWorkerDetails(id);
}
--
Gitblit v1.7.1