|
|
@@ -458,6 +458,8 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
|
|
|
|
|
|
//接口请求表单类型（施工质检 或 监理抽检）
|
|
|
Set<String> tabTableOwnerSets = new HashSet<>();
|
|
|
+
|
|
|
+ /*tableOwner!=null，表示从资料填报查询，查权限数据，roleTableOwnerSets=取交集后*/
|
|
|
if (StringUtils.isNotEmpty(tableOwner)) {
|
|
|
String tableOwners;
|
|
|
if (tableOwner.equals("1")) {
|
|
|
@@ -468,9 +470,12 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
|
|
|
tableOwners = "7,8,9";
|
|
|
}
|
|
|
tabTableOwnerSets.addAll(Func.toStrList(tableOwners));
|
|
|
+
|
|
|
+ //取交集
|
|
|
+ roleTableOwnerSets.retainAll(tabTableOwnerSets);
|
|
|
}
|
|
|
- //取交集
|
|
|
- roleTableOwnerSets.retainAll(tabTableOwnerSets);
|
|
|
+
|
|
|
+ /*tableOwner=null，表示从工程划分处查询，默认查询所有类型数据，roleTableOwnerSets=原始*/
|
|
|
|
|
|
//判断是客户端还是APP
|
|
|
List<AppWbsTreeContractVO> resultTabs;
|
liuyc