From 1c482625154845f26379fb97d931b1cf72b2633c Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期五, 07 三月 2025 09:10:05 +0800
Subject: [PATCH] Merge branch 'dev_cr' into dev
---
performance-server/src/main/resources/mapper/AuxiliaryWorkingHoursDayMapper.xml | 2 +-
cnas-require/src/main/java/com/ruoyi/require/controller/ProcurementSuppliesExpendsController.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cnas-require/src/main/java/com/ruoyi/require/controller/ProcurementSuppliesExpendsController.java b/cnas-require/src/main/java/com/ruoyi/require/controller/ProcurementSuppliesExpendsController.java
index d8dd387..52a7f8e 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/controller/ProcurementSuppliesExpendsController.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/controller/ProcurementSuppliesExpendsController.java
@@ -36,7 +36,7 @@
Integer added = procurementSuppliesExpendsService.addExpends(dto);
if ( added == 0) {
- return Result.fail("褰撳墠搴撳瓨涓嶈冻");
+ throw new RuntimeException("褰撳墠搴撳瓨涓嶈冻");
}
return Result.success(added);
}
diff --git a/performance-server/src/main/resources/mapper/AuxiliaryWorkingHoursDayMapper.xml b/performance-server/src/main/resources/mapper/AuxiliaryWorkingHoursDayMapper.xml
index 48e6bb2..8e17027 100644
--- a/performance-server/src/main/resources/mapper/AuxiliaryWorkingHoursDayMapper.xml
+++ b/performance-server/src/main/resources/mapper/AuxiliaryWorkingHoursDayMapper.xml
@@ -62,7 +62,7 @@
</select>
<select id="selectListByIds" resultType="com.ruoyi.performance.pojo.AuxiliaryWorkingHoursDay">
select * from auxiliary_working_hours_day
- where state='宸插鏍�'
+ where state='宸叉壒鍑�'
<if test="ids !=null and ids != ''">
and name_user in
<foreach collection="ids" index="index" open="(" separator="," close=")" item="val">
--
Gitblit v1.9.3