From 3be6b8a0b31b780f626724691fcb304de3b7d9f2 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 06 九月 2024 17:06:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/UIManagerController.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/UIManagerController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/UIManagerController.java
index 9540755..d686499 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/UIManagerController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/UIManagerController.java
@@ -1,16 +1,16 @@
package com.vci.web.controller;
import com.vci.corba.common.PLException;
+import com.vci.corba.portal.data.PLPageDefination;
import com.vci.corba.portal.data.PLTabPage;
import com.vci.corba.portal.data.PLUILayout;
-import com.vci.dto.RoleRightDTO;
import com.vci.dto.UIAuthorDTO;
-import com.vci.starter.web.pagemodel.Tree;
import com.vci.pagemodel.PLUILayoutCloneVO;
import com.vci.starter.web.annotation.log.VciBusinessLog;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.BaseQueryObject;
import com.vci.starter.web.pagemodel.BaseResult;
+import com.vci.starter.web.pagemodel.DataGrid;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.web.service.OsBtmServiceI;
import com.vci.web.service.UIManagerServiceI;
@@ -21,7 +21,9 @@
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
+import javax.xml.crypto.Data;
import java.io.IOException;
+import java.util.Comparator;
import java.util.List;
/**
@@ -187,9 +189,9 @@
*/
@GetMapping( "/getTabByContextIdAndType")
@VciBusinessLog(operateName = "鏍规嵁涓婁笅鏂嘔D鍜屽尯鍩熺被鍨嬶紝鎸夐『搴忚幏鍙栧綋鍓嶅尯鍩熺殑tab椤�")
- public BaseResult<List<PLTabPage>> getTabByContextIdAndType(String contextId, int areaType){
+ public BaseResult<DataGrid> getTabByContextIdAndType(String contextId, int areaType){
try {
- return BaseResult.dataList(uiManagerService.getTabByContextIdAndType(contextId,areaType));
+ return BaseResult.dataGrid(uiManagerService.getTabByContextIdAndType(contextId,areaType));
}catch (Exception e) {
e.printStackTrace();
String exceptionMessage = "鏍规嵁涓婁笅鏂嘔D鍜屽尯鍩熺被鍨嬶紝鎸夐『搴忚幏鍙栧綋鍓嶅尯鍩熺殑tab鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e);
@@ -285,7 +287,7 @@
}
/***
- * @param selectTreeList 鍕鹃�夌殑闇�瑕佷繚瀛樼殑鏁版嵁瀵硅薄
+ * @param uiAuthorDTO 鍕鹃�夌殑闇�瑕佷繚瀛樼殑鏁版嵁瀵硅薄
* @return
*/
@PostMapping( "/authorizedUI")
--
Gitblit v1.10.0