bug修复

huanghongfa

2021-05-20 9948ec3e6fb464d9aea91428927bd24d90b7e787

bug修复

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVaccinesEnrollRecordServiceImpl.java

@@ -45,6 +45,7 @@
    public R getVaccinesUserListByApp(VaccinesEnrollUserByAppDTO enrollUserByAppDTO){
        //查询当前用户的家庭成员列表
        List<VaccinesEnrollUserByAppVO> userLists = new ArrayList<>();
        List<VaccinesEnrollUserByAppVO> newUserLists = new ArrayList<>();
        //将自己的信息组装进家庭成员列表中
        VaccinesEnrollUserByAppVO ownUser = this.baseMapper.getSysUser(enrollUserByAppDTO.getUserId());
        if(ownUser != null){
@@ -63,22 +64,23 @@
                if(user.getIsUser() == null){
                    user.setIsUser(2);
                }
                if(StringUtils.isEmpty(user.getJob())){
                    user.setJob("暂无");
                }
                //查询当前用户是否已经报名
                ComMngVaccinesEnrollRecordDO enrollRecordDO = this.baseMapper.selectOne(new QueryWrapper<ComMngVaccinesEnrollRecordDO>()
                        .lambda().eq(ComMngVaccinesEnrollRecordDO::getFamilyUserId,user.getUserId()).eq(ComMngVaccinesEnrollRecordDO::getType,enrollUserByAppDTO.getVaccinesId()));
                        .lambda().eq(ComMngVaccinesEnrollRecordDO::getFamilyUserId,user.getUserId())
                        .eq(ComMngVaccinesEnrollRecordDO::getType,enrollUserByAppDTO.getVaccinesId())
                        .eq(ComMngVaccinesEnrollRecordDO::getFamilyUserType,user.getIsUser()));
                if(enrollRecordDO != null){
                    user.setIsEnroll(VaccinesEnrollUserByAppVO.isEnroll.yes);
                }else{
                    user.setIsEnroll(VaccinesEnrollUserByAppVO.isEnroll.no);
                    newUserLists.add(user);
                }

                if(StringUtils.isEmpty(user.getJob())){
                    user.setJob("暂无");
                }

            });
        }
        return R.ok(userLists);
        return R.ok(newUserLists);
    }

    /**