From c16a867c943e25a25d64f02fb95e755ef1a7c9f9 Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Mon, 30 Sep 2024 18:03:25 +0800
Subject: [PATCH] 1、审核过程中申请记录的申请时间和申请人无法查看 2、审核联合处置申请在申请部门已办结后会报错,且无法继续审核 3、案件不予受理后在已办中无记录 4、上报的案件上级部门回退后下级部门接收不到 5、广州市综治中心纠纷依然可以选择上报,且点击上报后报错

---
 dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/GridUserInfoController.java |   29 +++++++++++++++++++++++++----
 1 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/GridUserInfoController.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/GridUserInfoController.java
index 093050e..1b0ae7d 100644
--- a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/GridUserInfoController.java
+++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/GridUserInfoController.java
@@ -1,7 +1,11 @@
 package cn.huge.module.grid.controller;
 
 import cn.huge.base.common.bo.R;
-import cn.huge.module.grid.domain.vo.GridUserVo;
+import cn.huge.base.common.utils.ReturnSucUtils;
+import cn.huge.module.grid.domain.dto.GridRoleMenuDTO;
+import cn.huge.module.grid.domain.dto.GridSysRoleDTO;
+import cn.huge.module.grid.domain.dto.GridUserRoleDTO;
+import cn.huge.module.grid.domain.vo.*;
 import cn.huge.module.grid.service.GridUserService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -10,6 +14,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 @Slf4j
 @RestController
@@ -20,11 +25,27 @@
 
     /**
      * 根据用户token获取用户信息
-     * @param token
+     * @url {ctx}/api/thrid/grid/user/get-userinfo
+     * @param gridTokenVo
      * @return
      */
     @PostMapping("/get-userinfo")
-    public R<GridUserVo> getUserInfo(@RequestBody String token) {
-        return gridUserService.getUserInfo(token);
+    public R<GridUserVo> getUserInfo(@RequestBody GridTokenVo gridTokenVo) {
+        return gridUserService.getUserInfo(gridTokenVo);
+    }
+
+    @PostMapping("/get-user-role")
+    public R<List<GridUserRoleDTO>> getUserRoleList(@RequestBody GridUserRoleVo gridUserRoleVo) {
+        return gridUserService.getUserRoleList(gridUserRoleVo);
+    }
+
+    @PostMapping("/get-sys-role")
+    public R<GridSysRoleDTO> getSysRoleList(@RequestBody GridOrgVo gridOrgVo) {
+        return gridUserService.getSysRoleList(gridOrgVo);
+    }
+
+    @PostMapping("/get-role-menu")
+    public R<List<GridRoleMenuDTO>> getRoleMenu(@RequestBody GridRoleMenuVo gridRoleMenuVo) {
+        return gridUserService.getRoleMenu(gridRoleMenuVo);
     }
 }

--
Gitblit v1.8.0