huanghongfa
2022-04-14 1990de023b30bf3982be1d5b2a0111c3ca2cc02c
修改bug
2个文件已修改
15 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbCheckUnitServiceImpl.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbCheckUnitServiceImpl.java
@@ -8,6 +8,7 @@
import com.panzhihua.common.model.vos.partybuilding.PartyBuildingMemberVO;
import com.panzhihua.common.model.vos.partybuilding.excel.ComPbCheckUnitErrorExcelVO;
import com.panzhihua.common.model.vos.partybuilding.excel.ComPbCheckUnitExcelVO;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_dangjian.dao.ComPbMemberDAO;
import com.panzhihua.service_dangjian.dao.ComPbMemberRoleDAO;
import com.panzhihua.service_dangjian.entity.ComPbCheckUnit;
@@ -134,7 +135,11 @@
     */
    @Override
    public R detailById(Long id) {
        return R.ok(this.baseMapper.queryById(id));
        ComPbCheckUnitVo checkUnitVo = this.baseMapper.queryById(id);
        if(checkUnitVo != null && StringUtils.isEmpty(checkUnitVo.getContacts())){
            checkUnitVo.setContacts("待编辑负责人");
        }
        return R.ok(checkUnitVo);
    }
    /**
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java
@@ -1159,6 +1159,12 @@
    @Override
    public R getPagePbMember(PartyBuildingMemberVO dto) {
        return R.ok(comPbMemberDAO.getPbMemberByApplets(new Page(dto.getPageNum(),dto.getPageSize()),dto));
        IPage<PartyBuildingMemberVO> memberPage = comPbMemberDAO.getPbMemberByApplets(new Page(dto.getPageNum(),dto.getPageSize()),dto);
        memberPage.getRecords().forEach(member -> {
            if(StringUtils.isEmpty(member.getOrgName())){
                member.setOrgName("待编辑党支部");
            }
        });
        return R.ok(memberPage);
    }
}