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

wl

2022-10-17 d46beba25ccb64a1047a98d642b6ce45e82f0bee

 ycl-common/src/main/java/com/ycl/service/user/impl/UmsDepartManageServiceImpl.java

@@ -4,11 +4,11 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.api.BasePageDTO;
import com.ycl.entity.depart.SccgDepart;
import com.ycl.entity.depart.UmsDepart;
import com.ycl.entity.user.UmsAdmin;
import com.ycl.entity.user.UmsDepartManage;
import com.ycl.mapper.user.UmsDepartManageMapper;
import com.ycl.service.depart.SccgDepartService;
import com.ycl.service.depart.UmsDepartService;
import com.ycl.service.user.UmsDepartManageService;
import com.ycl.service.user.UmsAdminService;
import com.ycl.vo.depart.DepartVO;
@@ -32,7 +32,7 @@
    @Resource
    private UmsDepartManageMapper umsDepartManageMapper;
    @Resource
    private SccgDepartService sccgDepartService;
    private UmsDepartService sccgDepartService;
    @Resource
    private UmsAdminService umsAdminService;

@@ -72,7 +72,7 @@
            DepartVO.AdminDepartInfoVO adminDepartInfoVO = null;
            for (UmsDepartManage umsAdminDepart : departList) {
                adminDepartInfoVO = new DepartVO.AdminDepartInfoVO();
                SccgDepart sccgDepart = sccgDepartService.loadDepartById(umsAdminDepart.getDepartId());
                UmsDepart sccgDepart = sccgDepartService.loadDepartById(umsAdminDepart.getDepartId());
                UmsAdmin umsAdmin = umsAdminService.getById(userId);
                adminDepartInfoVO.setDepartId(umsAdminDepart.getDepartId());
                adminDepartInfoVO.setDepartName(sccgDepart.getDepartName());