chuangte/electripper-v2
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

协议新增分类

Browse Source
This commit is contained in:
SjS 2025-04-27 11:08:49 +08:00
parent 828d8d3de0
commit e7246d6029
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-web/src/main/java/com/ruoyi/web/app/AppAgreementController.java
View File

@ -2,6 +2,7 @@ package com.ruoyi.web.app;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.ruoyi.bst.agreement.domain.AgreementQuery; 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.bst.agreement.service.AgreementService;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
@ -21,9 +22,7 @@ public class AppAgreementController extends BaseController {
public AjaxResult getAgreement(AgreementQuery query) { public AjaxResult getAgreement(AgreementQuery query) {
PageHelper.startPage(1, 1); PageHelper.startPage(1, 1);
PageHelper.orderBy("create_time desc"); PageHelper.orderBy("create_time desc");
if (query.getContentType()==null) { query.setContentType(AgreementContentType.TEXT.getCode());
return AjaxResult.error("内容类型不能为空");
}
if (query.getAgreementType()==null) { if (query.getAgreementType()==null) {
return AjaxResult.error("协议类型不能为空"); return AjaxResult.error("协议类型不能为空");
} }

1
ruoyi-web/src/main/java/com/ruoyi/web/app/AppCustomerServiceController.java
View File

@ -29,6 +29,7 @@ public class AppCustomerServiceController extends BaseController {
startPage(); startPage();
startOrderBy(); startOrderBy();
query.setIsEnabled(CustomerServiceStatus.ENABLE.getStatus()); query.setIsEnabled(CustomerServiceStatus.ENABLE.getStatus());
query.setDeleted(false);
return getDataTable(customerServiceService.selectCustomerServiceList(query)); return getDataTable(customerServiceService.selectCustomerServiceList(query));
} }