diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java
index bbf82554..a724e332 100644
--- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java
+++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java
@@ -1068,6 +1068,7 @@ public class ActSarItemsEOService {
}
break;
case "standType": sarStandardsInfoEO.setStandType(valueStr); break;
+ case "standSystem": sarStandardsInfoEO.setStandSystem(valueStr); break;
case "standYear": sarStandardsInfoEO.setStandYear(valueStr); break;
case "standNature": sarStandardsInfoEO.setStandNature(valueStr); break;
case "standEnName": sarStandardsInfoEO.setStandEnName(valueStr); break;
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/dao/TsResourceDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/dao/TsResourceDao.java
index be0671ec..335a7986 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/dao/TsResourceDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/dao/TsResourceDao.java
@@ -3,6 +3,8 @@ package com.adc.da.slrs.sarResource.dao;
import com.adc.da.slrs.sarResource.entity.TsResource;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.List;
+
/**
*
* Mapper 接口
@@ -13,4 +15,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
public interface TsResourceDao extends BaseMapper {
+ List queryMenuByDis(TsResource sarMenuEO);
+
+ List selectMenuByRole(TsResource sarMenuEO);
+
}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/entity/TsResource.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/entity/TsResource.java
index c94365c1..39e2f196 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/entity/TsResource.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/entity/TsResource.java
@@ -91,4 +91,10 @@ public class TsResource extends BaseEntity {
@TableField(exist = false)
private String parentIdsName;
+ @TableField(exist=false)
+ private List roleIds;
+
+ @TableField(exist=false)
+ private List childMenuIds;
+
}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/ITsResourceService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/ITsResourceService.java
index 35feb558..e66ec54c 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/ITsResourceService.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/ITsResourceService.java
@@ -1,6 +1,7 @@
package com.adc.da.slrs.sarResource.service;
import com.adc.da.http.ResponseMessage;
+import com.adc.da.slrs.sarMenu.entity.SarMenu;
import com.adc.da.slrs.sarResource.entity.TsResource;
import com.baomidou.mybatisplus.extension.service.IService;
@@ -16,8 +17,12 @@ import java.util.List;
*/
public interface ITsResourceService extends IService {
+ List selectMenuByRole(TsResource sarMenuEO);
+
List getParentMenuId(String menuId);
+ List queryRoleMenuIdList(String sordDivide, String menuId) throws Exception;
+
/**
* 通过Ids查询menu
* @param menuIds :菜单Ids
@@ -25,6 +30,8 @@ public interface ITsResourceService extends IService {
*/
List getMenuByIds(List menuIds);
+ List queryMenuByDis(TsResource sarMenuEO);
+
List getAll(TsResource tsResource);
ResponseMessage