Merge branch 'dev-2.0.0' into dev-2.0.1

mitao

7 天以前 ca19278469a1d7f133a3684b844257c08c9d5d03

Merge branch 'dev-2.0.0' into dev-2.0.1

# Conflicts:
#	springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/SystemUserServiceImpl.java

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/PartyMemberServiceImpl.java

@@ -58,6 +58,14 @@
     */
    @Override
    public Page<PartyMember> pageList(PartyMemberQuery query, SystemUserVo loginUserInfo) {
        SystemUser user = systemUserService.getById(loginUserInfo.getId());
        if (Objects.isNull(user)){
            throw new ServiceException("用户不存在");
        }
        loginUserInfo.setAccountLevel(user.getAccountLevel());
        loginUserInfo.setDistrictsCode(user.getDistrictsCode());
        loginUserInfo.setStreetId(user.getStreetId());
        loginUserInfo.setCommunityId(user.getCommunityId());
        return  baseMapper.pageList(new Page<>(query.getPageNum(), query.getPageSize()),query,loginUserInfo);
    }
    /**
@@ -127,6 +135,14 @@
     */
    @Override
    public void export(PartyMemberQuery query, SystemUserVo loginUserInfo) throws IOException {
        SystemUser user = systemUserService.getById(loginUserInfo.getId());
        if (Objects.isNull(user)){
            throw new ServiceException("用户不存在");
        }
        loginUserInfo.setAccountLevel(user.getAccountLevel());
        loginUserInfo.setDistrictsCode(user.getDistrictsCode());
        loginUserInfo.setStreetId(user.getStreetId());
        loginUserInfo.setCommunityId(user.getCommunityId());
     List<PartyMember> list = baseMapper.queryList(query,loginUserInfo);
        List<PartyMemberExcel> partyMemberExcels = BeanUtil.copyToList(list, PartyMemberExcel.class);
        response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/SystemUserServiceImpl.java

@@ -1,5 +1,6 @@
package com.panzhihua.sangeshenbian.service.impl;

import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -10,14 +11,18 @@
import com.panzhihua.sangeshenbian.dao.SystemUserLevelMapper;
import com.panzhihua.sangeshenbian.dao.SystemUserMapper;
import com.panzhihua.sangeshenbian.model.entity.ComAct;
import com.panzhihua.sangeshenbian.model.entity.ComStreet;
import com.panzhihua.sangeshenbian.model.entity.PartyMember;
import com.panzhihua.sangeshenbian.model.entity.SystemUser;
import com.panzhihua.sangeshenbian.model.entity.SystemUserLevel;
import com.panzhihua.sangeshenbian.model.vo.RegionVO;
import com.panzhihua.sangeshenbian.service.IComActService;
import com.panzhihua.sangeshenbian.service.IComStreetService;
import com.panzhihua.sangeshenbian.service.ISystemUserService;
import com.panzhihua.sangeshenbian.warpper.SystemUserList;
import com.panzhihua.sangeshenbian.warpper.SystemUserListVo;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;

@@ -30,11 +35,13 @@
 * @author zhibing.pu
 * @Date 2025/2/18 22:30
 */
@Slf4j
@Service
@RequiredArgsConstructor(onConstructor_ = {@Lazy})
public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemUser> implements ISystemUserService {
    private final IComActService comActService;
    private final SystemUserLevelMapper systemUserLevelMapper;
    private final IComStreetService comStreetService;
    /**
     * 获取列表数据
     * @param query
@@ -119,7 +126,9 @@
     */
    @Override
    public List<RegionVO> getRegionTree(SystemUserVo loginUserInfo) {
        Integer accountLevel = loginUserInfo.getAccountLevel();
        log.info("getRegionTree入参：{}",JSONObject.toJSONString(loginUserInfo));
        SystemUser systemUser = getById(loginUserInfo.getId());
        Integer accountLevel = systemUser.getAccountLevel();
        List<RegionVO> regionTree = new ArrayList<>();
        switch (accountLevel) {
            case 1:
@@ -135,17 +144,23 @@
                });
                break;
            case 2:
                regionTree = baseMapper.getStreet(loginUserInfo.getDistrictsCode());
                regionTree = baseMapper.getStreet(systemUser.getDistrictsCode());
                regionTree.forEach(regionVO->{
                    List<RegionVO> communities = baseMapper.getCommunity(regionVO.getId());
                    regionVO.setChildren(communities);
                });
                break;
            case 3:
                regionTree = baseMapper.getCommunity(loginUserInfo.getStreetId());
                ComStreet street = comStreetService.getById(systemUser.getStreetId());
                RegionVO streetVO = new RegionVO();
                streetVO.setId(street.getStreetId());
                streetVO.setName(street.getName());
                List<RegionVO> communities = baseMapper.getCommunity(systemUser.getStreetId());
                streetVO.setChildren(communities);
                regionTree = Lists.newArrayList(streetVO);
                break;
            case 4:
                ComAct byId = comActService.getById(loginUserInfo.getCommunityId());
                ComAct byId = comActService.getById(systemUser.getCommunityId());
                RegionVO regionVO = new RegionVO();
                regionVO.setId(byId.getCommunityId().toString());
                regionVO.setName(byId.getName());

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/resources/mapper/PartyMemberMapper.xml

@@ -147,7 +147,7 @@
        FROM
            sgsb_party_member
        WHERE
            audit_status = 0 and phone != ${phone} and del_flag = 0
            audit_status = 0 and del_flag = 0
        <if test="accountLevel==2">
            and districts_code = #{districtsCode}
        </if>