From eceb72b1b2f09a49e153e2320ede0b7b71dfb8d1 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期六, 12 十一月 2022 11:09:03 +0800
Subject: [PATCH] token获取物业id处理
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoExpertApi.java | 7 +++++--
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java | 2 +-
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserFeedbackDO.java | 1 +
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 9 ++++++---
4 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java
index e0ba75a..7226f7a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java
@@ -66,7 +66,7 @@
comEvent.setRequestUserId(loginUser.getUserId());
comEvent.setRequestUserName(loginUser.getName());
comEvent.setRequestUserTel(loginUser.getPhone());
- comEvent.setAppId(loginUser.getAppId());
+ //comEvent.setAppId(loginUser.getAppId());
return comEventService.insertComEvent(comEvent);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoExpertApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoExpertApi.java
index a856ec3..0628c7b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoExpertApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoExpertApi.java
@@ -51,7 +51,7 @@
@PostMapping
public R add(@RequestBody ComSanshuoExpertDTO comSanshuoExpertDTO){
comSanshuoExpertDTO.setCreateBy(this.getLoginUserInfo().getName());
- comSanshuoExpertDTO.setAppId(getLoginUserInfo().getAppId());
+ comSanshuoExpertDTO.setAppId(userService.detailUser(getLoginUserInfo().getUserId()).getData().getAppId());
return comSanShuoExpertService.addOrUpdateExpert(comSanshuoExpertDTO);
}
@@ -86,6 +86,7 @@
@RequestParam(value = "size",required = false)Integer size,
@RequestParam(value = "level",required = false)Integer level){
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ loginUserInfo.setAppId(userService.detailUser(getLoginUserInfo().getUserId()).getData().getAppId());
return comSanShuoExpertService.expertPage(keyWord,page,size,loginUserInfo,level);
}
@@ -181,7 +182,9 @@
public R backstageList(@RequestParam(value = "level",required = false)Integer level,
@RequestParam(value = "page",required = false)Integer page,
@RequestParam(value = "size",required = false)Integer size){
- return comSanShuoExpertService.backstageList(level,getLoginUserInfo(),page,size);
+ LoginUserInfoVO loginUserInfo = getLoginUserInfo();
+ loginUserInfo.setAppId(userService.detailUser(getLoginUserInfo().getUserId()).getData().getAppId());
+ return comSanShuoExpertService.backstageList(level,loginUserInfo,page,size);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserFeedbackDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserFeedbackDO.java
index 24f39b4..e15bcf3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserFeedbackDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserFeedbackDO.java
@@ -76,4 +76,5 @@
* 关联物业id
* */
private Long propertyId;
+ private String reply;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
index e178986..15fc6e5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -3978,9 +3978,12 @@
@Override
public R feedBackReply(SysUserFeedbackVO sysUserFeedbackVO) {
- SysUserFeedbackDO sysUserFeedbackDO=new SysUserFeedbackDO();
- BeanUtils.copyProperties(sysUserFeedbackVO, sysUserFeedbackDO);
- return R.ok(sysUserFeedbackDAO.updateById(sysUserFeedbackDO));
+ if (isNull(sysUserFeedbackVO.getReply())){
+ return R.fail("回复内容不能为空");
+ }
+ SysUserFeedbackDO sysUserFeedbackDO1 = sysUserFeedbackDAO.selectById(sysUserFeedbackVO.getId());
+ sysUserFeedbackDO1.setReply(sysUserFeedbackVO.getReply());
+ return R.ok(sysUserFeedbackDAO.updateById(sysUserFeedbackDO1));
}
@Override
--
Gitblit v1.7.1