From f15494d34823ded87efc396d98e2eb0108f74a3d Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Sun, 5 Nov 2023 17:36:41 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cnadmin/monitor/service/impl/LogServiceImpl.java |  7 +++----
 .../cnadmin/system/service/impl/RoleServiceImpl.java | 12 ++++++------
 .../cnadmin/system/service/impl/UserServiceImpl.java | 10 +++++-----
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/LogServiceImpl.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/LogServiceImpl.java
index b68f6765..d94e9696 100644
--- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/LogServiceImpl.java
+++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/LogServiceImpl.java
@@ -139,10 +139,9 @@ public class LogServiceImpl implements LogService {
     public SystemLogDetailResp get(Long id) {
         LogDO logDO = logMapper.selectById(id);
         CheckUtils.throwIfNotExists(logDO, "LogDO", "ID", id);
-
-        SystemLogDetailResp detailVO = BeanUtil.copyProperties(logDO, SystemLogDetailResp.class);
-        this.fill(detailVO);
-        return detailVO;
+        SystemLogDetailResp detail = BeanUtil.copyProperties(logDO, SystemLogDetailResp.class);
+        this.fill(detail);
+        return detail;
     }
 
     @Override
diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleServiceImpl.java
index 932b2141..7ee1ebb4 100644
--- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleServiceImpl.java
+++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleServiceImpl.java
@@ -135,16 +135,16 @@ public class RoleServiceImpl extends BaseServiceImpl<RoleMapper, RoleDO, RoleRes
     public void fillDetail(Object detailObj) {
         super.fillDetail(detailObj);
         if (detailObj instanceof RoleDetailResp) {
-            RoleDetailResp detailVO = (RoleDetailResp)detailObj;
-            Long roleId = detailVO.getId();
-            if (SysConsts.ADMIN_ROLE_CODE.equals(detailVO.getCode())) {
+            RoleDetailResp detail = (RoleDetailResp)detailObj;
+            Long roleId = detail.getId();
+            if (SysConsts.ADMIN_ROLE_CODE.equals(detail.getCode())) {
                 List<MenuResp> list = menuService.list(null, null);
                 List<Long> menuIds = list.stream().map(MenuResp::getId).collect(Collectors.toList());
-                detailVO.setMenuIds(menuIds);
+                detail.setMenuIds(menuIds);
             } else {
-                detailVO.setMenuIds(roleMenuService.listMenuIdByRoleIds(CollUtil.newArrayList(roleId)));
+                detail.setMenuIds(roleMenuService.listMenuIdByRoleIds(CollUtil.newArrayList(roleId)));
             }
-            detailVO.setDeptIds(roleDeptService.listDeptIdByRoleId(roleId));
+            detail.setDeptIds(roleDeptService.listDeptIdByRoleId(roleId));
         }
     }
 
diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java
index dcdc8250..68623e6a 100644
--- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java
+++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java
@@ -153,11 +153,11 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, UserDO, UserRes
     public void fillDetail(Object detailObj) {
         super.fillDetail(detailObj);
         if (detailObj instanceof UserDetailResp) {
-            UserDetailResp detailVO = (UserDetailResp)detailObj;
-            detailVO.setDeptName(ExceptionUtils.exToNull(() -> deptService.get(detailVO.getDeptId()).getName()));
-            List<Long> roleIdList = userRoleService.listRoleIdByUserId(detailVO.getId());
-            detailVO.setRoleIds(roleIdList);
-            detailVO.setRoleNames(String.join(StringConsts.CHINESE_COMMA, roleService.listNameByIds(roleIdList)));
+            UserDetailResp detail = (UserDetailResp)detailObj;
+            detail.setDeptName(ExceptionUtils.exToNull(() -> deptService.get(detail.getDeptId()).getName()));
+            List<Long> roleIdList = userRoleService.listRoleIdByUserId(detail.getId());
+            detail.setRoleIds(roleIdList);
+            detail.setRoleNames(String.join(StringConsts.CHINESE_COMMA, roleService.listNameByIds(roleIdList)));
         }
     }