From c1a463b9f1c0a7160dbd0ac1c7490eef13861a5e Mon Sep 17 00:00:00 2001
From: huangh <hshgjzd5@163.com>
Date: Tue, 29 Oct 2024 15:02:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzdyh_test' into gzdyh_test
---
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/service/CtRoleService.java | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 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 a6ba27a..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
@@ -5,8 +5,15 @@
import cn.huge.base.common.utils.IdUtils;
import cn.huge.module.client.api.impl.UtilsClientImpl;
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.rsoper.domain.dto.RoleMenuTreeDTO;
+import cn.huge.module.ctuser.service.CtUserService;
+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;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import lombok.extern.slf4j.Slf4j;
@@ -37,6 +44,12 @@
@Autowired
private UtilsClientImpl utilsClient;
+ @Autowired
+ private CtUserService ctUserService;
+ @Autowired
+ private CtRolefunService ctRolefunService;
+ @Autowired
+ private RsRolefunService rsRolefunService;
/**
* 更新对象
@@ -128,4 +141,16 @@
}
}
+ /**
+ * 根据单位编号和角色编号查询
+ * @param unitId 单位编号
+ * @param roleId 角色编号
+ * @return
+ */
+ public CtRole getByUnitIdAndRoleId(String unitId, String roleId){
+ QueryWrapper<CtRole> ctRoleQueryWrapper = new QueryWrapper<>();
+ ctRoleQueryWrapper.eq("unit_id", unitId).eq("role_code", roleId);
+ CtRole ctRole = mapper.selectOne(ctRoleQueryWrapper);
+ return ctRole;
+ }
}
--
Gitblit v1.8.0