Merge remote-tracking branch 'origin/1.0.1' into 1.0.1

k94314517

2024-04-12 02cb47bef10bafc3a591f160f0b286df529c704a

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

@@ -5,6 +5,7 @@
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;
@@ -25,6 +26,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 +104,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 +121,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);
    }
@@ -131,6 +146,12 @@
//            List<SystemDepartment> list = systemDepartmentService.findList(new QueryWrapper<>());
//            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());
@@ -202,7 +223,12 @@

    @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());
@@ -224,6 +250,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);