From 3f9ebf19e687c33287b0eaec64d4564a212f57db Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期三, 12 十月 2022 16:59:57 +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/UmsDepartManageServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsDepartManageServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsDepartManageServiceImpl.java
index e9cf66c..514b105 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsDepartManageServiceImpl.java
+++ b/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());
--
Gitblit v1.8.0