bug修改

101captain

2022-07-20 c40f8e3d2e08e108780091776437242528bf61d6

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

@@ -1,6 +1,7 @@
package com.panzhihua.service_community.service.impl;

import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -9,8 +10,10 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.user.AdministratorsUserVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.service_community.dao.ComActSocialOrgDao;
import com.panzhihua.service_community.entity.ComActSocialMember;
import com.panzhihua.service_community.dao.ComActSocialMemberDao;
import com.panzhihua.service_community.entity.ComActSocialOrg;
import com.panzhihua.service_community.service.ComActSocialMemberService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
@@ -18,6 +21,8 @@

import javax.annotation.Resource;
import java.util.Date;

import static java.util.Objects.nonNull;

/**
 * 社会组织成员表(ComActSocialMember)表服务实现类
@@ -32,8 +37,18 @@
    private ComActSocialMemberDao comActSocialMemberDao;
    @Resource
    private UserService userService;
    @Resource
    private ComActSocialOrgDao comActSocialOrgDao;
    @Override
    public R pageList(CommonPage commonPage) {
        Integer userType = commonPage.getUserType();
        if (nonNull(userType) && userType.equals(3)) {
            ComActSocialOrg comActSocialOrg = comActSocialOrgDao.selectOne(new LambdaQueryWrapper<ComActSocialOrg>()
                    .eq(ComActSocialOrg::getUserId, commonPage.getUserId()));
            if (nonNull(comActSocialOrg)) {
                commonPage.setParamId(comActSocialOrg.getId());
            }
        }
        return R.ok(this.comActSocialMemberDao.pageList(new Page(commonPage.getPage(),commonPage.getSize()),commonPage));
    }

@@ -55,6 +70,7 @@
        if(comActSocialMemberVO.getStreetId()!=null){
            administratorsUserVO.setStreetId(comActSocialMemberVO.getStreetId());
        }
        administratorsUserVO.setCommunityId(comActSocialMemberVO.getCommunityId());
        administratorsUserVO.setName(comActSocialMemberVO.getName());
        administratorsUserVO.setPhone(comActSocialMemberVO.getPhone());
        R r=userService.addUserBackstageProperty(administratorsUserVO);