From aa221b6b6c3939130c78e4219207d14ce877ff30 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 06 八月 2025 15:57:34 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/LocMastController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index 96adfe8..ce4a85c 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -72,7 +72,7 @@
EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
convert(param, wrapper);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(locMastService.selectPage(new Page<>(curr, limit), wrapper));
+ return R.ok(locMastService.selectPage(new Page<>(curr, limit), wrapper.eq("status",0)));
}
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
@@ -104,7 +104,7 @@
@Transactional
public R update(LocMast locMast){
if (Cools.isEmpty(locMast) || null==locMast.getLocNo()){
- return R.error();
+ return R.error("鍙傛暟缂哄け");
}
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
@@ -136,18 +136,18 @@
adjDetl.setAppeTime(now);
adjDetl.setAppeUser(getUserId());
if (!adjDetlService.insert(adjDetl)) {
- throw new CoolException("鏈嶅姟鍣ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ throw new CoolException("璋冩暣璁板綍淇敼澶辫触");
}
}
if (!locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()))) {
- throw new CoolException("鏈嶅姟鍣ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ throw new CoolException("搴撲綅鏄庣粏淇敼澶辫触");
}
}
}
locMast.setModiUser(getUserId());
locMast.setModiTime(now);
if(!locMastService.updateById(locMast)) {
- throw new CoolException("鏈嶅姟鍣ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ throw new CoolException("搴撲綅鐘舵�佷慨鏀瑰け璐�");
}
return R.ok();
}
@@ -156,7 +156,7 @@
public R delete(@RequestParam String param){
List<LocMast> list = JSONArray.parseArray(param, LocMast.class);
if (Cools.isEmpty(list)){
- return R.error();
+ return R.error("鍙傛暟缂哄け");
}
for (LocMast entity : list){
locMastService.delete(new EntityWrapper<>(entity));
--
Gitblit v1.9.1