提交一把

jiangping

2024-11-01 b1c4362017f88a6f145e31c06375bc3f2b676696

 server/service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java

@@ -5,10 +5,13 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.CompanyDepartment;
import com.doumee.dao.system.SystemUserJoinMapper;
import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.dto.QuerySystemUserDTO;
@@ -25,6 +28,7 @@
import com.github.pagehelper.PageInfo;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -102,9 +106,16 @@

    @Override
    public SystemUser findById(Integer id) {
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();

        MPJLambdaWrapper<SystemUser> queryWrapper = new MPJLambdaWrapper<>();
        queryWrapper.selectAll(SystemUser.class);
        queryWrapper.eq(SystemUser::getId,id );
        queryWrapper.eq(SystemUser::getType,loginUserInfo.getType() );
        if(!Constants.equalsInteger(loginUserInfo.getType(),Constants.ZERO)){
            //如果是企业账号
            queryWrapper.eq(SystemUser::getCompanyId,loginUserInfo.getCompanyId() );
        }
        queryWrapper.orderByDesc(SystemUser::getCreateTime);
        SystemUser  result = systemUserJoinMapper.selectJoinOne( SystemUser.class, queryWrapper);
        return result;
@@ -112,12 +123,18 @@

    @Override
    public SystemUser findOne(SystemUser systemUser) {
        Wrapper<SystemUser> wrapper = new QueryWrapper<>(systemUser);
        Wrapper<SystemUser> wrapper = new QueryWrapper<SystemUser>(systemUser).last("limit 1");
        return systemUserMapper.selectOne(wrapper);
    }

    @Override
    public List<SystemUser> findList(SystemUser systemUser) {
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        systemUser.setType(loginUserInfo.getType());
        if(!Constants.equalsInteger(loginUserInfo.getType(),Constants.ZERO)){
            //如果是企业账号
            systemUser.setCompanyId(loginUserInfo.getCompanyId());
        }
        Wrapper<SystemUser> wrapper = new QueryWrapper<>(systemUser);
        return systemUserMapper.selectList(wrapper);
    }
@@ -132,6 +149,12 @@
//            List<Integer> collect = list.stream().map(s -> s.getId()).collect(Collectors.toList());
//            pageWrap.getModel().setDepartmentIds(collect);
        }
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        pageWrap.getModel().setType(loginUserInfo.getType());
        if(!Constants.equalsInteger(loginUserInfo.getType(),Constants.ZERO)){
            //如果是企业账号
            pageWrap.getModel().setCompanyId(loginUserInfo.getCompanyId());
        }
        // 执行查询
        PageHelper.startPage(pageWrap.getPage(), pageWrap.getCapacity());
        List<SystemUserListVO> userList = systemUserMapper.selectManageList(pageWrap.getModel(), pageWrap.getOrderByClause());
@@ -145,6 +168,29 @@
            user.setZhuboRoomUrl(zhuboRoomUrl);
        }
        return PageData.from(new PageInfo<>(userList));
    }
    @Override
    public PageData<SystemUserListVO> findPageCompany(PageWrap<QuerySystemUserDTO> pageWrap) {
        // 根部门条件处理（需查询根部门下所有部门的用户）
        IPage<Company> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        Utils.MP.blankToNull(pageWrap.getModel());
        pageWrap.getModel().setType(Constants.UserType.COMPANY.getKey());//查询企业类型
        // 执行查询
        MPJLambdaWrapper<SystemUser> wrapper = new MPJLambdaWrapper<>();
        wrapper .selectAll(SystemUser.class)
                .select("(select count(distinct(a.company_id) from company_permisson a where a.user_id=t.id and a.ideleted=0 and a.type=1)",SystemUser::getAuthNum)
                .selectAs(Company::getName,SystemUser::getCompanyName)
                .selectAs(CompanyDepartment::getName,SystemUser::getDepartmentName)
                .leftJoin(Company.class,Company::getId,SystemUser::getCompanyId)
                .leftJoin(CompanyDepartment.class,CompanyDepartment::getId,SystemUser::getDepartmentId)
                .eq( pageWrap.getModel().getDepartmentId() !=null,SystemUser::getDepartmentId, pageWrap.getModel().getDepartmentId())
                .eq( pageWrap.getModel().getStatus() !=null,SystemUser::getStatus, pageWrap.getModel().getStatus())
                .like(StringUtils.isNotBlank(pageWrap.getModel().getMobile()),SystemUser::getMobile, pageWrap.getModel().getMobile())
                .like(StringUtils.isNotBlank(pageWrap.getModel().getRealname()),SystemUser::getRealname, pageWrap.getModel().getRealname())
                .like(StringUtils.isNotBlank(pageWrap.getModel().getUsername()),SystemUser::getUsername, pageWrap.getModel().getUsername())
                .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),SystemUser::getCompanyName, pageWrap.getModel().getCompanyName());
        IPage<SystemUserListVO> result =  systemUserMapper.selectJoinPage(page,SystemUserListVO.class,wrapper);
        return  PageData.from(result);
    }

    @Override
@@ -202,20 +248,23 @@

    @Override
    public PageData<SystemUser> findAllList(PageWrap<SystemUser> pageWrap) {

        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        pageWrap.getModel().setType(loginUserInfo.getType());
        if(!Constants.equalsInteger(loginUserInfo.getType(),Constants.ZERO)){
            //如果是企业账号
            pageWrap.getModel().setCompanyId(loginUserInfo.getCompanyId());
        }
        IPage<SystemUser> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        MPJLambdaWrapper<SystemUser> queryWrapper = new MPJLambdaWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());
        queryWrapper.selectAll(SystemUser.class);
        queryWrapper.eq(SystemUser::getDeleted, Constants.ZERO);
        queryWrapper.and(StringUtils.isNotBlank(pageWrap.getModel().getUsername()),ms->ms.like(SystemUser::getUsername,pageWrap.getModel().getUsername())
        .or().like(SystemUser::getMobile,pageWrap.getModel().getUsername())
        queryWrapper.and(StringUtils.isNotBlank(pageWrap.getModel().getUsername()),
                ms->ms.like(SystemUser::getUsername,pageWrap.getModel().getUsername())
                    .or().like(SystemUser::getMobile,pageWrap.getModel().getUsername())
                .or().like(SystemUser::getRealname,pageWrap.getModel().getUsername())
        );
        queryWrapper.orderByDesc(SystemUser::getCreateTime);



        IPage<SystemUser> result = systemUserJoinMapper.selectJoinPage(page, SystemUser.class, queryWrapper);

        return PageData.from(result);
@@ -224,6 +273,12 @@

    @Override
    public List<SystemUser> findAllList(SystemUser pageWrap){
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        pageWrap.setType(loginUserInfo.getType());
        if(!Constants.equalsInteger(loginUserInfo.getType(),Constants.ZERO)){
            //如果是企业账号
            pageWrap.setCompanyId(loginUserInfo.getCompanyId());
        }
        MPJLambdaWrapper<SystemUser> queryWrapper = new MPJLambdaWrapper<>();

        queryWrapper.selectAll(SystemUser.class);