From 13aabf169c59b40d1702e5d684ac522f588ddc4c Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期二, 27 九月 2022 22:16:02 +0800
Subject: [PATCH] 添加性别字段

---
 ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsAdminServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
similarity index 93%
rename from ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsAdminServiceImpl.java
rename to ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
index 55e726a..e30bfab 100644
--- a/ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsAdminServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
@@ -1,4 +1,4 @@
-package com.ycl.service.platform.user.impl;
+package com.ycl.service.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.platform.depart.UmsDepart;
-import com.ycl.entity.platform.user.*;
+import com.ycl.entity.depart.UmsDepart;
+import com.ycl.entity.user.*;
 import com.ycl.exception.Asserts;
-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.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.UmsDepartService;
+import com.ycl.service.user.UmsDepartManageService;
 import com.ycl.service.redis.RedisService;
-import com.ycl.service.platform.user.UmsAdminCacheService;
-import com.ycl.service.platform.user.UmsAdminRoleRelationService;
-import com.ycl.service.platform.user.UmsAdminService;
+import com.ycl.service.user.UmsAdminCacheService;
+import com.ycl.service.user.UmsAdminRoleRelationService;
+import com.ycl.service.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 UmsDepartService sccgDepartService;
+    private UmsDepartService departService;
     @Resource
     private UmsDepartManageService umsAdminDepartService;
     @Resource
@@ -322,9 +322,9 @@
         List<UmsAdmin> records = page1.getRecords();
         if (CollUtil.isNotEmpty(records)) {
             records.forEach(e -> {
-                UmsDepart 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