From e7246d6029f167b5a4e2badad0f85d2a623b4557 Mon Sep 17 00:00:00 2001 From: SjS Date: Sun, 27 Apr 2025 11:08:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E6=96=B0=E5=A2=9E=E5=88=86?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ruoyi/web/app/AppAgreementController.java | 5 ++--- .../java/com/ruoyi/web/app/AppCustomerServiceController.java | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ruoyi-web/src/main/java/com/ruoyi/web/app/AppAgreementController.java b/ruoyi-web/src/main/java/com/ruoyi/web/app/AppAgreementController.java index 3dd93ed..e3f4500 100644 --- a/ruoyi-web/src/main/java/com/ruoyi/web/app/AppAgreementController.java +++ b/ruoyi-web/src/main/java/com/ruoyi/web/app/AppAgreementController.java @@ -2,6 +2,7 @@ package com.ruoyi.web.app; import com.github.pagehelper.PageHelper; import com.ruoyi.bst.agreement.domain.AgreementQuery; +import com.ruoyi.bst.agreement.domain.enums.AgreementContentType; import com.ruoyi.bst.agreement.service.AgreementService; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; @@ -21,9 +22,7 @@ public class AppAgreementController extends BaseController { public AjaxResult getAgreement(AgreementQuery query) { PageHelper.startPage(1, 1); PageHelper.orderBy("create_time desc"); - if (query.getContentType()==null) { - return AjaxResult.error("内容类型不能为空"); - } + query.setContentType(AgreementContentType.TEXT.getCode()); if (query.getAgreementType()==null) { return AjaxResult.error("协议类型不能为空"); } diff --git a/ruoyi-web/src/main/java/com/ruoyi/web/app/AppCustomerServiceController.java b/ruoyi-web/src/main/java/com/ruoyi/web/app/AppCustomerServiceController.java index 2d716b8..d771398 100644 --- a/ruoyi-web/src/main/java/com/ruoyi/web/app/AppCustomerServiceController.java +++ b/ruoyi-web/src/main/java/com/ruoyi/web/app/AppCustomerServiceController.java @@ -29,6 +29,7 @@ public class AppCustomerServiceController extends BaseController { startPage(); startOrderBy(); query.setIsEnabled(CustomerServiceStatus.ENABLE.getStatus()); + query.setDeleted(false); return getDataTable(customerServiceService.selectCustomerServiceList(query)); }