From bfa6af3b50fa16ed4f1d835f8f9fc9237c83e64c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期日, 27 四月 2025 17:26:32 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiShou into dev
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/AgreementServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/AgreementServiceImpl.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/AgreementServiceImpl.java
index 85fd9d5..834d8d9 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/AgreementServiceImpl.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/AgreementServiceImpl.java
@@ -22,8 +22,8 @@
@Override
public R<Agreement> dataInfo(Integer type) {
- if (!Constants.ZERO.equals(type) && !Constants.ONE.equals(type) && !Constants.TWO.equals(type)) {
- return R.fail("查询类型异常！(0注册协议;1:隐私政策;2:司机操作指导)");
+ if (!Constants.ZERO.equals(type) && !Constants.ONE.equals(type) && !Constants.TWO.equals(type) && !Constants.THREE.equals(type)) {
+ return R.fail("查询类型异常！(0注册协议;1:隐私政策;2:司机操作指导；3：服务规则管理)");
}
return R.ok(lambdaQuery().eq(Agreement::getContentType, type).one());
}
@@ -32,7 +32,7 @@
@Transactional(rollbackFor = Exception.class)
public R<String> saveData(Agreement agreement) {
Integer type = agreement.getContentType();
- if (Constants.ZERO.equals(type) || Constants.ONE.equals(type) || Constants.TWO.equals(type)) {
+ if (!Constants.ZERO.equals(type) && !Constants.ONE.equals(type) && !Constants.TWO.equals(type)) {
return R.fail("保存类型异常！(0注册协议;1:隐私政策;2:司机操作指导)");
}
Agreement dbDate = lambdaQuery().eq(Agreement::getContentType, type).one();
--
Gitblit v1.7.1