From c29a6c5cd3f232ab61d9e97df17c63cf1e4b0755 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 07 十二月 2023 11:46:14 +0800
Subject: [PATCH] 分类路径注入，过滤默认属性、过滤表单不显示导致分类注入失败bug修改

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

diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateButtonController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateButtonController.java
index e05eb2e..f095b7c 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateButtonController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateButtonController.java
@@ -17,25 +17,15 @@
 package com.vci.ubcs.code.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.vci.ubcs.code.dto.CodeClassifyTemplateButtonDTO;
-import com.vci.ubcs.code.service.ICodeTempbuttonService;
+import com.vci.ubcs.code.service.ICodeClassifyTemplateButtonService;
 import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateButtonVO;
-import com.vci.ubcs.code.wrapper.CodeTempbuttonWrapper;
 import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
-import com.vci.ubcs.starter.web.pagemodel.DataGrid;
 import com.vci.ubcs.starter.web.util.VciBaseUtil;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.Func;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -56,17 +46,16 @@
 	/**
 	 * 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽� 鏈嶅姟
 	 */
-	private final ICodeTempbuttonService codeClassifyTemplateButtonService;
+	private final ICodeClassifyTemplateButtonService codeClassifyTemplateButtonService;
 
 	/**
 	 * 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽垪琛�
-	 * @param codeClassifyTemplateButtonVO 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
-	 * @param query
+	 * @param baseQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
 	 * @return 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽樉绀哄璞″垪琛�
 	 */
 	@GetMapping("/gridCodeClassifyTemplateButton")
-	public DataGrid<CodeClassifyTemplateButtonVO> gridCodeClassifyTemplateButton(CodeClassifyTemplateButtonVO codeClassifyTemplateButtonVO,Query query){
-		return codeClassifyTemplateButtonService.gridCodeClassifyTemplateButton(codeClassifyTemplateButtonVO,query);
+	public R<IPage<CodeClassifyTemplateButtonVO>> gridCodeClassifyTemplateButton(BaseQueryObject baseQueryObject){
+		return R.data(codeClassifyTemplateButtonService.gridCodeClassifyTemplateButton(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper()));
 	}
 
 	/**
@@ -75,8 +64,8 @@
 	 * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
 	 */
 	@PostMapping( "/addSave")
-	public R addSave(@RequestBody CodeClassifyTemplateButtonDTO codeClassifyTemplateButtonDTO){
-		return R.status(codeClassifyTemplateButtonService.addSave(codeClassifyTemplateButtonDTO));
+	public R<CodeClassifyTemplateButtonVO> addSave(@RequestBody CodeClassifyTemplateButtonDTO codeClassifyTemplateButtonDTO){
+		return R.data(codeClassifyTemplateButtonService.addSave(codeClassifyTemplateButtonDTO));
 	}
 
 	/**
@@ -85,8 +74,8 @@
 	 * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
 	 */
 	@PutMapping("/editSave")
-	public R editSave(@RequestBody CodeClassifyTemplateButtonDTO codeClassifyTemplateButtonDTO){
-		return R.status(codeClassifyTemplateButtonService.editSave(codeClassifyTemplateButtonDTO));
+	public R<CodeClassifyTemplateButtonVO> editSave(@Valid @RequestBody CodeClassifyTemplateButtonDTO codeClassifyTemplateButtonDTO){
+		return R.data(codeClassifyTemplateButtonService.editSave(codeClassifyTemplateButtonDTO));
 	}
 
 	/**
@@ -95,7 +84,7 @@
 	 * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
 	 */
 	@DeleteMapping( "/deleteData")
-	public R delCodeClassifyTemplateButton( CodeClassifyTemplateButtonDTO codeClassifyTemplateButtonDTO) {
+	public R delCodeClassifyTemplateButton(@Valid @RequestBody CodeClassifyTemplateButtonDTO codeClassifyTemplateButtonDTO) {
 		return codeClassifyTemplateButtonService.deleteCodeClassifyTemplateButton(codeClassifyTemplateButtonDTO);
 	}
 
@@ -127,11 +116,11 @@
 	 * @return 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽樉绀哄璞″垪琛紝鐢熸晥鐨勫唴瀹�
 	 */
 	@GetMapping("/refDataGrid")
-	public DataGrid<CodeClassifyTemplateButtonVO> refDataGridCodeClassifyTemplateButton(BaseQueryObject baseQueryObject){
+	public R<IPage<CodeClassifyTemplateButtonVO>> refDataGridCodeClassifyTemplateButton(BaseQueryObject baseQueryObject){
 		if(baseQueryObject == null){
 			baseQueryObject = new BaseQueryObject();
 		}
-		return codeClassifyTemplateButtonService.refDataGridCodeClassifyTemplateButton(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
+		return R.data(codeClassifyTemplateButtonService.refDataGridCodeClassifyTemplateButton(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper()));
 	}
 
 }

--
Gitblit v1.9.3