From 0b597ea4500b3463ac9f0983dbabaca52417226c Mon Sep 17 00:00:00 2001
From: liyj <1003249715@qq.com>
Date: Sat, 14 Sep 2024 12:21:37 +0800
Subject: [PATCH] 回退上报流程bug修复2

---
 dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/controller/web/CtRoleWebController.java |   14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/controller/web/CtRoleWebController.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/controller/web/CtRoleWebController.java
index f28d86a..1db725d 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/controller/web/CtRoleWebController.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/controller/web/CtRoleWebController.java
@@ -7,13 +7,12 @@
 import cn.huge.module.ctrole.domain.po.CtRole;
 import cn.huge.module.ctrole.service.CtRoleService;
 import cn.huge.module.ctrole.service.CtRolefunService;
-import cn.huge.module.ctuser.domain.bo.RoleTreeBO;
 import cn.huge.module.ctuser.service.CtUserService;
-import cn.huge.module.cust.dto.CtUserDTO;
+import cn.huge.module.rsoper.domain.dto.RsRoleDTO;
+import cn.huge.module.rsoper.service.RsRoleService;
 import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -21,7 +20,6 @@
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -42,12 +40,10 @@
 
     @Autowired
     private CtRoleService service;
-
     @Autowired
     private CtUserService ctUserService;
-
     @Autowired
-    private CtRolefunService ctRolefunService;
+    private RsRoleService rsRoleService;
 
     /**
     * 获取请求URL参数
@@ -184,8 +180,8 @@
     @GetMapping("/getById")
     public Object getById(@RequestParam(value = "id") String id, @CurrentUser String userId) {
         try {
-            CtRoleBO bo = service.webGetById(id, userId);
-            return ReturnSucUtils.getRepInfo(bo);
+            RsRoleDTO rsRoleDTO = rsRoleService.webGetRoleMenu(id, userId);
+            return ReturnSucUtils.getRepInfo(rsRoleDTO);
         } catch (Exception e) {
             return ReturnFailUtils.getRepInfo();
         }

--
Gitblit v1.8.0