From 9119297360c94cd5a2e265adcd6d1dede4de425a Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期四, 24 二月 2022 16:53:12 +0800
Subject: [PATCH] 五微服务bug修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComFmsServiceServiceImpl.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComFmsServiceServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComFmsServiceServiceImpl.java
index eb97d3e..7f8b07b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComFmsServiceServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComFmsServiceServiceImpl.java
@@ -9,6 +9,8 @@
import javax.annotation.Resource;
+import com.panzhihua.service_community.dao.ComFmsTeamMemberDAO;
+import com.panzhihua.service_community.entity.ComFmsTeamMember;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -53,6 +55,8 @@
private ComFmsServiceRecordDAO comFmsServiceRecordDAO;
@Resource
private ComFmsServiceEvaluationsDAO comFmsServiceEvaluationsDAO;
+ @Resource
+ private ComFmsTeamMemberDAO comFmsTeamMemberDAO;
/**
* 后台新增微服务
@@ -323,6 +327,13 @@
Page page = new Page<>();
page.setSize(adminDTO.getPageSize());
page.setCurrent(adminDTO.getPageNum());
+ LoginUserInfoVO userInfo = adminDTO.getUserInfo();
+ ComFmsTeamMember comFmsTeamMember = comFmsTeamMemberDAO.selectOne(new LambdaQueryWrapper<ComFmsTeamMember>()
+ .eq(ComFmsTeamMember::getPhone, userInfo.getPhone())
+ .eq(ComFmsTeamMember::getCommunityId, userInfo.getCommunityId()));
+ if (nonNull(comFmsTeamMember)) {
+ adminDTO.setMemberId(comFmsTeamMember.getId());
+ }
return R.ok(this.baseMapper.pageDealFmsService(page, adminDTO));
}
@@ -341,7 +352,11 @@
if (isNull(comFmsService.getMemberId())) {
return R.fail("还未分配服务人员");
}
- if (!comFmsService.getMemberId().equals(adminDTO.getUserId())) {
+ LoginUserInfoVO userInfo = adminDTO.getUserInfo();
+ ComFmsTeamMember comFmsTeamMember = comFmsTeamMemberDAO.selectOne(new LambdaQueryWrapper<ComFmsTeamMember>()
+ .eq(ComFmsTeamMember::getPhone, userInfo.getPhone())
+ .eq(ComFmsTeamMember::getCommunityId, userInfo.getCommunityId()));
+ if (isNull(comFmsTeamMember) || !comFmsService.getMemberId().equals(comFmsTeamMember.getId())) {
return R.fail("不是指定的分配服务人员");
}
Boolean isEnd = adminDTO.getIsEnd();
--
Gitblit v1.7.1