From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-community/src/main/java/com/java110/community/smo/impl/MenuInnerServiceSMOImpl.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/smo/impl/MenuInnerServiceSMOImpl.java b/service-community/src/main/java/com/java110/community/smo/impl/MenuInnerServiceSMOImpl.java
old mode 100644
new mode 100755
index c7ef2c3..1a49a94
--- a/service-community/src/main/java/com/java110/community/smo/impl/MenuInnerServiceSMOImpl.java
+++ b/service-community/src/main/java/com/java110/community/smo/impl/MenuInnerServiceSMOImpl.java
@@ -1,14 +1,15 @@
package com.java110.community.smo.impl;
-import com.java110.utils.util.BeanConvertUtil;
import com.java110.community.dao.IMenuServiceDao;
import com.java110.core.base.smo.BaseServiceSMO;
-import com.java110.core.smo.menu.IMenuInnerServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.basePrivilege.BasePrivilegeDto;
+import com.java110.dto.basePrivilege.HasPrivilegeDto;
import com.java110.dto.menu.MenuDto;
import com.java110.dto.menuGroup.MenuGroupDto;
+import com.java110.intf.community.IMenuInnerServiceSMO;
+import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -16,6 +17,7 @@
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
+import java.util.Map;
/**
* @ClassName FloorInnerServiceSMOImpl
@@ -125,7 +127,7 @@
* @return 灏忓尯涓嬬殑灏忓尯妤艰褰曟暟
*/
@RequestMapping(value = "/checkUserHasResource", method = RequestMethod.POST)
- public boolean checkUserHasResource(@RequestBody BasePrivilegeDto basePrivilegeDto) {
+ public List<Map> checkUserHasResource(@RequestBody BasePrivilegeDto basePrivilegeDto) {
return menuServiceDaoImpl.checkUserHasResource(BeanConvertUtil.beanCovertMap(basePrivilegeDto));
}
@@ -164,6 +166,12 @@
}
@Override
+ public List<HasPrivilegeDto> hasPrivilege(@RequestBody HasPrivilegeDto hasPrivilegeDto) {
+ List<HasPrivilegeDto> privilegeDtos = BeanConvertUtil.covertBeanList(menuServiceDaoImpl.hasPrivilege(BeanConvertUtil.beanCovertMap(hasPrivilegeDto)), HasPrivilegeDto.class);
+ return privilegeDtos;
+ }
+
+ @Override
public int queryMenusCount(@RequestBody MenuDto menuDto) {
return menuServiceDaoImpl.queryMenusCount(BeanConvertUtil.beanCovertMap(menuDto));
}
--
Gitblit v1.8.0