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-cust/src/main/java/cn/huge/module/ctrole/service/CtRoleService.java | 32 +++++---------------------------
1 files changed, 5 insertions(+), 27 deletions(-)
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/service/CtRoleService.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/service/CtRoleService.java
index dbf45ca..6b53335 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/service/CtRoleService.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/service/CtRoleService.java
@@ -7,9 +7,10 @@
import cn.huge.module.ctrole.dao.mapper.CtRoleMapper;
import cn.huge.module.ctrole.domain.bo.CtRoleBO;
import cn.huge.module.ctrole.domain.po.CtRole;
-import cn.huge.module.ctuser.domain.bo.RoleTreeBO;
+import cn.huge.module.rsoper.domain.dto.RoleMenuTreeDTO;
import cn.huge.module.ctuser.service.CtUserService;
-import cn.huge.module.cust.dto.CtUserDTO;
+import cn.huge.module.rsoper.domain.po.RsRole;
+import cn.huge.module.rsoper.service.RsRolefunService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.BeanUtils;
@@ -43,12 +44,12 @@
@Autowired
private UtilsClientImpl utilsClient;
-
@Autowired
private CtUserService ctUserService;
-
@Autowired
private CtRolefunService ctRolefunService;
+ @Autowired
+ private RsRolefunService rsRolefunService;
/**
* 更新对象
@@ -151,28 +152,5 @@
ctRoleQueryWrapper.eq("unit_id", unitId).eq("role_code", roleId);
CtRole ctRole = mapper.selectOne(ctRoleQueryWrapper);
return ctRole;
- }
-
- /**
- * 根据单位编号和角色编号查询
- * @param id
- * @param userId
- * @return
- */
- public CtRoleBO webGetById(String id, String userId){
- // 临时-演示用户赋予超级管理员角色
- // 获取当前登录用户
- CtUserDTO loginUser = ctUserService.clientGetUserAll(userId);
- String acc = loginUser.getAcc();
- if ("yanstjy".equals(acc) || "yansjdb".equals(acc)){
- id = "2303191513151003";
- }
- CtRole ctRole = this.getById(id);
- CtRoleBO bo = new CtRoleBO();
- BeanUtils.copyProperties(ctRole,bo);
- //查询角色权限
- List<RoleTreeBO> roleTrees = ctRolefunService.getRolefunTree(ctRole.getId());
- bo.setRoleTreeBOS(roleTrees);
- return bo;
}
}
--
Gitblit v1.8.0