From d2263e86d837ef331d77fd39dccd79f100041e76 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 14 四月 2025 16:28:49 +0800
Subject: [PATCH] 获取轮灌组时，项目ID不为必须条件
---
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigation/IrrigationCtrl.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigation/IrrigationCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigation/IrrigationCtrl.java
index 474bb55..9399a4d 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigation/IrrigationCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigation/IrrigationCtrl.java
@@ -36,10 +36,9 @@
* @return
*/
@GetMapping(path = "/getSimpleProjects")
- public BaseResponse<QueryResultVo<List<VoProjectSimple>>> getSimpleProjects(QoProject qo) {
+ public BaseResponse<List<VoProjectSimple>> getSimpleProjects(QoProject qo) {
try {
- QueryResultVo<List<VoProjectSimple>> res = irrigationSv.getSimpleProjects(qo);
- return BaseResponseUtils.buildSuccess(res);
+ return BaseResponseUtils.buildSuccess(irrigationSv.getSimpleProjects(qo));
} catch (Exception e) {
log.error("鑾峰彇椤圭洰璁板綍寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage());
@@ -48,10 +47,9 @@
@GetMapping(path = "/getSimpleGroups")
public BaseResponse<QueryResultVo<List<VoGroupSimple>>> getSimpleGroups(QoGroup qo) {
- if(qo.getProjectId() == null) {
- return BaseResponseUtils.buildErrorMsg("璇烽�夋嫨椤圭洰");
- }
-
+ //if(qo.getProjectId() == null) {
+ // return BaseResponseUtils.buildErrorMsg("璇烽�夋嫨椤圭洰");
+ //}
try {
QueryResultVo<List<VoGroupSimple>> res = irrigationSv.getSimpleGroups(qo);
--
Gitblit v1.8.0