From 33b2b3a0e697e1bdb804a37de800b0471dfb0cef Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 28 九月 2022 20:28:55 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
index 880646f..e30bfab 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
@@ -10,17 +10,17 @@
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.depart.UmsDepart;
import com.ycl.entity.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.service.depart.UmsDepartService;
+import com.ycl.service.user.UmsDepartManageService;
import com.ycl.service.redis.RedisService;
import com.ycl.service.user.UmsAdminCacheService;
-import com.ycl.service.user.UmsAdminDepartService;
import com.ycl.service.user.UmsAdminRoleRelationService;
import com.ycl.service.user.UmsAdminService;
import com.ycl.utils.JwtTokenUtil;
@@ -74,9 +74,9 @@
@Resource
private UmsResourceMapper umsResourceMapper;
@Resource
- private SccgDepartService sccgDepartService;
+ private UmsDepartService departService;
@Resource
- private UmsAdminDepartService umsAdminDepartService;
+ private UmsDepartManageService umsAdminDepartService;
@Resource
private RedisService redisService;
@@ -322,9 +322,9 @@
List<UmsAdmin> records = page1.getRecords();
if (CollUtil.isNotEmpty(records)) {
records.forEach(e -> {
- SccgDepart sccgDepart = sccgDepartService.getById(e.getDepartmentId());
- if (null != sccgDepart) {
- e.setDepartName(sccgDepart.getDepartName());
+ UmsDepart umsDepart = departService.getById(e.getDepartmentId());
+ if (null != umsDepart) {
+ e.setDepartName(umsDepart.getDepartName());
}
});
}
--
Gitblit v1.8.0