puhanshu
2022-03-10 4feaef5e35f0dad7cc3f05e32fc7e3e52fa9396d
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVolunteerMngServiceImpl.java
@@ -59,8 +59,10 @@
    @Override
    public R addVolunteer(ComMngVolunteerMngVO comMngVolunteerMngVO) {
        String phone = comMngVolunteerMngVO.getPhone();
        String idCard = comMngVolunteerMngVO.getIdCard();
        Integer integer = comMngVolunteerMngDAO.selectCount(new QueryWrapper<ComMngVolunteerMngDO>().lambda()
            .eq(ComMngVolunteerMngDO::getPhone, phone).in(ComMngVolunteerMngDO::getState, Arrays.asList(1, 2)));
                .and(wrapper -> wrapper.eq(ComMngVolunteerMngDO::getPhone, phone).or().eq(ComMngVolunteerMngDO::getIdCard, idCard))
                .in(ComMngVolunteerMngDO::getState, Arrays.asList(1, 2)));
        if (null != integer && integer.intValue() > 0) {
            return R.fail("请勿重复申请");
        }
@@ -171,12 +173,7 @@
     */
    @Override
    public R detailVolunteerExamine(Long id) {
        ComMngVolunteerMngDO comMngVolunteerMngDO = comMngVolunteerMngDAO.selectById(id);
        if (ObjectUtils.isEmpty(comMngVolunteerMngDO)) {
            return R.fail("审核不存在");
        }
        ComMngVolunteerMngVO comMngVolunteerMngVO = new ComMngVolunteerMngVO();
        BeanUtils.copyProperties(comMngVolunteerMngDO, comMngVolunteerMngVO);
        ComMngVolunteerMngVO comMngVolunteerMngVO = comMngVolunteerMngDAO.detailVolunteerExamine(id);
        // String phone = comMngVolunteerMngVO.getPhone();
        // comMngVolunteerMngVO.setUserId(comMngVolunteerMngDAO.selectUserIdByPhone(phone));
        return R.ok(comMngVolunteerMngVO);