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

jiangping

2024-12-27 5506edbe54883b31db3cc8e4a1d9d0795a18a3c9

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

@@ -2,9 +2,12 @@

import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
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.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
@@ -12,6 +15,10 @@
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.CompanyDepartment;
import com.doumee.dao.business.CompanyDepartmentMapper;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.CompanyDepartment;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.system.SystemUserJoinMapper;
import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.dto.QuerySystemUserDTO;
@@ -66,6 +73,9 @@

    @Autowired
    private DepartmentDataPermissionAware departmentDataPermissionAware;

    @Autowired
    private CompanyDepartmentMapper companyDepartmentMapper;

    @Override
    public Integer create(SystemUser systemUser) {
@@ -150,7 +160,7 @@
//            pageWrap.getModel().setDepartmentIds(collect);
        }
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        pageWrap.getModel().setType(loginUserInfo.getType());
//        pageWrap.getModel().setType(loginUserInfo.getType());
        if(!Constants.equalsInteger(loginUserInfo.getType(),Constants.ZERO)){
            //如果是企业账号
            pageWrap.getModel().setCompanyId(loginUserInfo.getCompanyId());
@@ -283,13 +293,36 @@

        queryWrapper.selectAll(SystemUser.class);
        queryWrapper.eq(SystemUser::getDeleted, Constants.ZERO)
                    .eq(SystemUser::getType,pageWrap.getType());
                    .eq(SystemUser::getType,pageWrap.getType())
                    .eq(SystemUser::getCompanyId,loginUserInfo.getCompanyId())
               ;
        queryWrapper.orderByDesc(SystemUser::getCreateTime);
        List<SystemUser> result = systemUserJoinMapper.selectJoinList(SystemUser.class, queryWrapper);

        return result;
    }

    @Override
    public void updateHead(SystemUser systemUser) {
        SystemUser model  =systemUserJoinMapper.selectById(systemUser.getId());
        if(model ==null) {
            throw  new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，人员信息不存在！");
        }
        if(model.getDepartmentId()!=null) {
            if(Constants.equalsInteger(systemUser.getHeadStatus(),Constants.ONE)){
                //如果是取消主管
                companyDepartmentMapper.update(null,new UpdateWrapper<CompanyDepartment>().lambda()
                        .eq(CompanyDepartment::getId,model.getDepartmentId())
                        .set(CompanyDepartment::getHeadId,model.getId()));
            }else{
                //如果是设为主管
                companyDepartmentMapper.update(null,new UpdateWrapper<CompanyDepartment>().lambda()
                        .eq(CompanyDepartment::getId,model.getDepartmentId())
                        .set(CompanyDepartment::getHeadId,null)
                );
            }
        }
    }