From d87906519f8d9599961e7908ea775e9c74256219 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 16 八月 2024 16:42:17 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerCtrl.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerCtrl.java
index facd01d..bcbae33 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerCtrl.java
@@ -72,11 +72,11 @@
if (res.itemTotal != null && res.itemTotal > 0) {
return BaseResponseUtils.buildSuccess(res);
} else {
- return BaseResponseUtils.buildFail(ProjectResultCode.NO_RECORDS.getMessage());
+ return BaseResponseUtils.buildSuccess(ProjectResultCode.NO_RECORDS.getMessage());
}
//return BaseResponseUtils.buildSuccess(res);
} catch (Exception e) {
- log.error("鑾峰彇寮�鍗¤褰曞紓甯�", e);
+ log.error("鑾峰彇鎺у埗鍣ㄨ褰曞紓甯�", e);
return BaseResponseUtils.buildException(e.getMessage());
}
}
@@ -146,7 +146,7 @@
po.setOperateDt(operateTime);
po.setDeleted((byte) 0);
po.setFindDt(operateTime);
- if (po.getAddWays() != (byte) 2) {
+ if (po.getAddWays() == null) {
po.setAddWays((byte) 1);
}
Integer rec = Optional.ofNullable(controllerSv.addController(po)).orElse(0);
@@ -205,9 +205,9 @@
public BaseResponse<JSONArray> getNoBindingIntakes() {
try {
JSONArray array = controllerSv.getNoBindingIntakes();
- if (array.size() <= 0) {
- return BaseResponseUtils.buildFail(ProjectResultCode.NO_BINDING_INTAKE.getMessage());
- }
+// if (array.size() <= 0) {
+// return BaseResponseUtils.buildFail(ProjectResultCode.NO_BINDING_INTAKE.getMessage());
+// }
return BaseResponseUtils.buildSuccess(array);
} catch (Exception e) {
log.error("鏌ヨ鎺у埗鍣ㄥ紓甯�", e);
@@ -244,4 +244,6 @@
String fileName = URLEncoder.encode(rawFileName, "UTF-8").replaceAll("\\+", "%20");
response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
}
+
+
}
--
Gitblit v1.8.0