From 4783fc799e4416c4c90e07afd00e733502f0bba8 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 31 十月 2024 16:09:11 +0800
Subject: [PATCH] 1、更新日漏损最新记录有bug(新生成了记录,应该是更新老记录),修改之 ; 2、CommonV1_0_0中获取开关阀类型名称时,对于null返回空字符串。

---
 pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/intake/IntakeCtrl.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/intake/IntakeCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/intake/IntakeCtrl.java
index 8aaf0a0..b8a722e 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/intake/IntakeCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/intake/IntakeCtrl.java
@@ -64,17 +64,17 @@
 
     /**
      * 鏍规嵁鎿嶄綔鍛樿幏鍙栧父鐢ㄥ彇姘村彛锛堝湪绾垮拰涓嶅湪绾匡級
-     * @param operator
+     * @param operatorId
      * @return
      */
     @GetMapping(path = "used_intakes")
-    public BaseResponse<List<VoOnLineIntake>> getUsedIntakes(Long operator) {
-        if(operator == null || operator <= 0) {
+    public BaseResponse<List<VoOnLineIntake>> getUsedIntakes(Long operatorId) {
+        if(operatorId == null || operatorId <= 0) {
             return BaseResponseUtils.buildErrorMsg("鎿嶄綔鍛樹笉鑳戒负绌�");
         }
 
         try {
-            List<VoOnLineIntake> res = intakeSv.getUsedIntakes(operator);
+            List<VoOnLineIntake> res = intakeSv.getUsedIntakes(operatorId);
             return BaseResponseUtils.buildSuccess(res);
         } catch (Exception e) {
             log.error("鏌ヨ鍙栨按鍙e紓甯�", e);

--
Gitblit v1.8.0