五微服务bug修改

puhanshu

2022-02-24 9119297360c94cd5a2e265adcd6d1dede4de425a

 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();