Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-05-08 554e8aaef09ad38484ea043ab56405bbfea36c80

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java

@@ -5,15 +5,19 @@
import com.panzhihua.common.model.dtos.partybuilding.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.partybuilding.*;
import com.panzhihua.service_dangjian.dao.ComPbOrgDAO;
import com.panzhihua.service_dangjian.model.dos.ComPbMemberDO;
import com.panzhihua.service_dangjian.model.dos.ComPbOrgDO;
import com.panzhihua.service_dangjian.service.ComBpActivityService;
import com.panzhihua.service_dangjian.service.ComPbMemberService;
import com.panzhihua.service_dangjian.service.ComPbServiceTeamService;
import com.panzhihua.service_dangjian.service.PartyOrganizationService;
import org.springframework.beans.BeanUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;

/**
@@ -33,6 +37,8 @@
    private ComBpActivityService comBpActivityService;
    @Resource
    private ComPbServiceTeamService comPbServiceTeamService;
    @Resource
    private ComPbOrgDAO comPbOrgDAO;

    /**
     * 社区所有启用的党组织列表
@@ -513,7 +519,15 @@
    @GetMapping("usercertification")
    R userCertification(@RequestParam("id")Long id){
        List<ComPbMemberDO> comPbMemberDOList = comPbMemberService.list(new QueryWrapper<ComPbMemberDO>().lambda().eq(ComPbMemberDO::getUserId, id));
        return R.ok(comPbMemberDOList);
        List<PartyBuildingMemberVO> partyBuildingMemberVOList = new ArrayList<>();
        comPbMemberDOList.forEach(comPbMemberDO -> {
            PartyBuildingMemberVO partyBuildingMemberVO = new PartyBuildingMemberVO();
            BeanUtils.copyProperties(comPbMemberDO, partyBuildingMemberVO);
            ComPbOrgDO comPbOrgDO = comPbOrgDAO.selectById(partyBuildingMemberVO.getOrgId());
            partyBuildingMemberVO.setOrgName(comPbOrgDO.getName());
            partyBuildingMemberVOList.add(partyBuildingMemberVO);
        });
        return R.ok(partyBuildingMemberVOList);
    }