From 98dce0b733be283767c17b62ce7ff312aacd9f5d Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 24 六月 2026 13:25:48 +0800
Subject: [PATCH] 已领用并且被销售模块引用的公海客户不能回收或者编辑操作，已被销售模块引用的私海客户也不能编辑操作
---
src/main/java/com/ruoyi/waterrecord/service/impl/WaterRecordServiceImpl.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/waterrecord/service/impl/WaterRecordServiceImpl.java b/src/main/java/com/ruoyi/waterrecord/service/impl/WaterRecordServiceImpl.java
index b1c32b4..09604bc 100644
--- a/src/main/java/com/ruoyi/waterrecord/service/impl/WaterRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/waterrecord/service/impl/WaterRecordServiceImpl.java
@@ -4,8 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.constant.HttpStatus;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.waterrecord.mapper.WaterRecordMapper;
import com.ruoyi.waterrecord.pojo.WaterRecord;
import com.ruoyi.waterrecord.service.WaterRecordService;
@@ -35,18 +34,18 @@
}
@Override
- public R<?> importData(MultipartFile file) {
+ public AjaxResult importData(MultipartFile file) {
try {
ExcelUtil<WaterRecord> util = new ExcelUtil<WaterRecord>(WaterRecord.class);
List<WaterRecord> userList = util.importExcel(file.getInputStream());
if(CollectionUtils.isEmpty(userList)){
- return R.fail(HttpStatus.WARN, "妯℃澘閿欒鎴栧鍏ユ暟鎹负绌�");
+ return AjaxResult.warn("妯℃澘閿欒鎴栧鍏ユ暟鎹负绌�");
}
this.saveOrUpdateBatch(userList);
- return R.ok(true);
+ return AjaxResult.success(true);
}catch (Exception e){
e.printStackTrace();
- return R.fail("瀵煎叆澶辫触");
+ return AjaxResult.error("瀵煎叆澶辫触");
}
}
}
--
Gitblit v1.9.3