1：代码迁移

liyanqi

2022-09-15 34de42f43fd75a31fe0c0d51adf30fb554ad5fa6

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

File was renamed from ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
@@ -1,4 +1,4 @@
package com.ycl.service.user.impl;
package com.ycl.service.platform.user.impl;

import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
@@ -10,19 +10,19 @@
import com.ycl.bo.AdminUserDetails;
import com.ycl.dto.UmsAdminParam;
import com.ycl.dto.UpdateAdminPasswordParam;
import com.ycl.entity.depart.SccgDepart;
import com.ycl.entity.user.*;
import com.ycl.entity.platform.depart.UmsDepart;
import com.ycl.entity.platform.user.*;
import com.ycl.exception.Asserts;
import com.ycl.mapper.user.UmsAdminLoginLogMapper;
import com.ycl.mapper.user.UmsAdminMapper;
import com.ycl.mapper.user.UmsResourceMapper;
import com.ycl.mapper.user.UmsRoleMapper;
import com.ycl.service.depart.SccgDepartService;
import com.ycl.mapper.platform.user.UmsAdminLoginLogMapper;
import com.ycl.mapper.platform.user.UmsAdminMapper;
import com.ycl.mapper.platform.user.UmsResourceMapper;
import com.ycl.mapper.platform.user.UmsRoleMapper;
import com.ycl.service.platform.depart.UmsDepartService;
import com.ycl.service.platform.user.UmsDepartManageService;
import com.ycl.service.redis.RedisService;
import com.ycl.service.user.UmsAdminCacheService;
import com.ycl.service.user.UmsDepartManageService;
import com.ycl.service.user.UmsAdminRoleRelationService;
import com.ycl.service.user.UmsAdminService;
import com.ycl.service.platform.user.UmsAdminCacheService;
import com.ycl.service.platform.user.UmsAdminRoleRelationService;
import com.ycl.service.platform.user.UmsAdminService;
import com.ycl.utils.JwtTokenUtil;
import com.ycl.utils.SpringUtil;
import com.ycl.utils.common.LiveTimeMillisecond;
@@ -74,7 +74,7 @@
    @Resource
    private UmsResourceMapper umsResourceMapper;
    @Resource
    private SccgDepartService sccgDepartService;
    private UmsDepartService sccgDepartService;
    @Resource
    private UmsDepartManageService umsAdminDepartService;
    @Resource
@@ -322,7 +322,7 @@
        List<UmsAdmin> records = page1.getRecords();
        if (CollUtil.isNotEmpty(records)) {
            records.forEach(e -> {
                SccgDepart sccgDepart = sccgDepartService.getById(e.getDepartmentId());
                UmsDepart sccgDepart = sccgDepartService.getById(e.getDepartmentId());
                if (null != sccgDepart) {
                    e.setDepartName(sccgDepart.getDepartName());
                }