From b48356e1b39f8e812f85d1627c0fc18e1f4d58ba Mon Sep 17 00:00:00 2001
From: lihang <lihang@vci-tech.com>
Date: 星期四, 15 六月 2023 16:42:41 +0800
Subject: [PATCH] 对象建模菜单相关的bug修正
---
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/StatusController.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/StatusController.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/StatusController.java
index a7562b9..63b2ce0 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/StatusController.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/StatusController.java
@@ -1,5 +1,6 @@
package com.vci.ubcs.omd.controller;
+import com.alibaba.cloud.commons.lang.StringUtils;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.vci.ubcs.omd.entity.Status;
@@ -11,9 +12,11 @@
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
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.BeanUtil;
import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
import java.util.HashMap;
import java.util.List;
@@ -50,12 +53,8 @@
@GetMapping("page")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "鍒嗛〉鏌ヨ鐘舵�佹睜",notes = "鍒嗛〉鏌ヨ鐘舵�佹睜")
- public R<IPage<StatusVO>> page(BaseQueryObject baseQueryObject){
- Map<String, String> conditionMap = baseQueryObject.getConditionMap();
- if (conditionMap == null){
- conditionMap = new HashMap<>();
- }
- return R.data(statusService.listStatus(conditionMap,baseQueryObject.getPageHelper()));
+ public R<IPage<StatusVO>> page(@ApiIgnore @RequestParam Map<String, Object> condition, Query query){
+ return R.data(statusService.listStatus(condition,query));
}
/**
@@ -65,7 +64,11 @@
@ApiOperationSupport(order = 3)
@ApiOperation(value = "鏂板鎴栦慨鏀�",notes = "浼犲叆鐘舵�佹睜椤甸潰瀵硅薄")
public R<StatusVO> submit(@RequestBody StatusVO statusVO){
- return R.data(statusService.addSave(statusVO));
+ if (StringUtils.isBlank(statusVO.getOid())){
+ return R.data(statusService.addSave(statusVO));
+ }else {
+ return R.data(statusService.editSave(statusVO));
+ }
}
/**
--
Gitblit v1.9.3