From 371462edc6b3ee1de97c235d4a019b544badda0d Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期六, 14 二月 2026 22:09:37 +0800
Subject: [PATCH] AGV工作档界面和逻辑调整
---
src/main/java/com/zy/asrs/controller/WrkMastController.java | 18 ++++--------------
1 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastController.java b/src/main/java/com/zy/asrs/controller/WrkMastController.java
index 7a37f37..88db015 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastController.java
@@ -1,6 +1,5 @@
package com.zy.asrs.controller;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
@@ -56,6 +55,10 @@
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
+ // 璺宠繃绌哄�煎拰 "null" 瀛楃涓�
+ if (Cools.isEmpty(val) || "null".equals(val)) {
+ continue;
+ }
if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
@@ -86,19 +89,6 @@
wrkMast.setModiUser(getUserId());
wrkMast.setModiTime(new Date());
wrkMastService.updateById(wrkMast);
- return R.ok();
- }
-
- @RequestMapping(value = "/wrkMast/delete/auth")
- @ManagerAuth(memo = "宸ヤ綔妗ｅ垹闄�")
- public R delete(@RequestParam String param) {
- List<WrkMast> list = JSONArray.parseArray(param, WrkMast.class);
- if (Cools.isEmpty(list)) {
- return R.error();
- }
- for (WrkMast entity : list) {
- wrkMastService.delete(new EntityWrapper<>(entity));
- }
return R.ok();
}
--
Gitblit v1.9.1