From 72f5d233c15f12700098e9b994a6e144522438f3 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 09 八月 2023 16:01:37 +0800
Subject: [PATCH] 修改“查询当前用户的资源授权”接口
---
src/main/java/com/moon/server/controller/all/PermsController.java | 6 +++---
src/main/resources/mapper/all/PermsMapper.xml | 11 ++++++-----
src/main/java/com/moon/server/service/sys/ProxyService.java | 2 +-
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/moon/server/controller/all/PermsController.java b/src/main/java/com/moon/server/controller/all/PermsController.java
index 8279d9e..7a5780b 100644
--- a/src/main/java/com/moon/server/controller/all/PermsController.java
+++ b/src/main/java/com/moon/server/controller/all/PermsController.java
@@ -41,7 +41,7 @@
LayerService layerService;
@SysLog()
- @ApiOperation(value = "鏌ヨ褰撳墠鐢ㄦ埛鐨勮祫婧愭巿鏉�")
+ @ApiOperation(value = "鏌ヨ褰撳墠鐢ㄦ埛鐨勫浘灞傛巿鏉�")
@GetMapping(value = "/selectLayers")
public ResponseMsg<Object> selectLayers(HttpServletRequest req) {
try {
@@ -53,7 +53,7 @@
String uid = StaticData.ADMIN.equals(ue.getUid()) ? null : ue.getUid();
List<LayerEntity> rs = layerService.selectLayers(uid);
- return success(rs);
+ return success(null == rs ? 0 : rs.size(), rs);
} catch (Exception ex) {
return fail(ex, null);
}
@@ -72,7 +72,7 @@
String uid = StaticData.ADMIN.equals(ue.getUid()) ? null : ue.getUid();
List<ResEntity> rs = permsService.selectRes(uid);
- return success(rs);
+ return success(null == rs ? 0 : rs.size(), rs);
} catch (Exception ex) {
return fail(ex, null);
}
diff --git a/src/main/java/com/moon/server/service/sys/ProxyService.java b/src/main/java/com/moon/server/service/sys/ProxyService.java
index f46d4a1..36cc0de 100644
--- a/src/main/java/com/moon/server/service/sys/ProxyService.java
+++ b/src/main/java/com/moon/server/service/sys/ProxyService.java
@@ -56,7 +56,7 @@
// 9.鑾峰彇璧勬簮瀹炰綋
ResEntity entity = getResEntity(ue, resId);
- if (null == entity || StaticData.THREE != entity.getType() || StringHelper.isNull(entity.getProxy()) || StringHelper.isNull(entity.getUrl())) {
+ if (null == entity || StaticData.TWO != entity.getType() || StringHelper.isNull(entity.getProxy()) || StringHelper.isNull(entity.getUrl())) {
WebHelper.writeStr2Page(res, ILLEGAL_RESOURCE);
return;
}
diff --git a/src/main/resources/mapper/all/PermsMapper.xml b/src/main/resources/mapper/all/PermsMapper.xml
index 76d7266..7a99945 100644
--- a/src/main/resources/mapper/all/PermsMapper.xml
+++ b/src/main/resources/mapper/all/PermsMapper.xml
@@ -2,18 +2,19 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.moon.server.mapper.all.PermsMapper">
<select id="selectRes" resultType="com.moon.server.entity.sys.ResEntity">
- select distinct d.*
+ select distinct e.*
from lf.sys_user a
inner join lf.sys_role_user b on a.id = b.userid
- inner join lf.sys_role_res c on b.roleid = c.roleid
- inner join lf.sys_res d on c.resid = d.id
+ inner join lf.sys_role_layer c on b.roleid = c.roleid
+ inner join lf.sys_layer d on c.layerid = d.id
+ inner join lf.sys_res e on d.resid = e.id
<where>
- d.status = 1
+ d.status = 1 and e.status between 1 and 2
<if test="uid != null">
and a.uid = #{uid}
</if>
</where>
- order by d.id;
+ order by e.id;
</select>
<select id="selectMenus" resultType="com.moon.server.entity.all.MenusAuthEntity">
--
Gitblit v1.9.3