From dc590d026e1130a98c70181fb65f8ed09414e787 Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期五, 14 七月 2023 17:48:11 +0800
Subject: [PATCH] 1、主要解决获取当前用户信息等问题,使用AuthUtil来进行获取,对生成token等信息进行了修改增加。

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java
index 62f129c..c1941fd 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java
@@ -510,12 +510,12 @@
 	 * @return 鍒嗙被鐮佸�肩殑鍐呭
 	 */
 	@GetMapping("/listCodeClassifyValueBySecOid")
-	public DataGrid<CodeClassifyValueVO> listCodeClassifyValueBySecOid(String classifySecOid, String parentClassifyValueOid){
+	public IPage<CodeClassifyValueVO> listCodeClassifyValueBySecOid(String classifySecOid, String parentClassifyValueOid){
 		List<CodeClassifyValueVO> valueVOS = engineService.listCodeClassifyValueBySecOid(classifySecOid, parentClassifyValueOid);
-		DataGrid<CodeClassifyValueVO> dataGrid = new DataGrid<>();
-		dataGrid.setData(valueVOS);
-		dataGrid.setTotal(valueVOS==null?0:valueVOS.size());
-		return dataGrid;
+		IPage<CodeClassifyValueVO> valueVOIPage = new Page<>();
+		valueVOIPage.setRecords(valueVOS);
+		valueVOIPage.setTotal(valueVOS==null?0:valueVOS.size());
+		return valueVOIPage;
 	}
 
 	/**
@@ -524,7 +524,7 @@
 	 * @return 缂栫爜瑙勫垯鐨勫唴瀹�
 	 */
 	@GetMapping("/getCodeRuleByClassifyOid")
-//	@VciUnCheckRight
+	//	@VciUnCheckRight
 	public R<CodeRuleVO> getCodeRuleByClassifyOid(String codeClassifyOid){
 		return R.data(engineService.getCodeRuleByClassifyOid(codeClassifyOid));
 	}

--
Gitblit v1.9.3