---修改启用和作废调用方式

itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/datalog/DefaultDataOperationListener.java

@@ -10,7 +10,7 @@ public class DefaultDataOperationListener<T> implements DataOperationListener<T>
 		if(content.getType()==OperationType.DELETE) {
 			CommonCallUtils.deleteBefore(content.getTableName(),content.getIdValue());
 		}else if(content.getType()==OperationType.DISABLE){
-			CommonCallUtils.deleteBefore(content.getTableName(),content.getIdValue());
+			CommonCallUtils.disableBefore(content.getTableName(),content.getIdValue());
 		}else if(content.getType()==OperationType.ENABLE){
 			CommonCallUtils.enableBefore(content.getTableName(),content.getIdValue());
 		}

itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/datalog/LogTableInfo.java

@@ -17,6 +17,8 @@ import com.pictc.utils.CollectionUtils;
 import com.pictc.utils.MybatisTools;
 import com.pictc.utils.SpringAnnotationUtils;
 import com.pictc.utils.StringUtils;
+import com.xjrsoft.common.constant.GlobalConstant;
+import com.xjrsoft.common.enums.YesOrNoEnum;
 
 import cn.hutool.core.bean.BeanUtil;
 import lombok.Data;
@@ -107,11 +109,22 @@ public class LogTableInfo {
 		BeanUtils.setFieldValue(idField,id,entity);
 	}
 	
+	public boolean isEnable(Object obj) {
+		Object val = getFieldValue(obj,GlobalConstant.VALID_PROPERTY);
+		return YesOrNoEnum.YES.getTextCode().equals(val);
+	}
+	
+	
+	public boolean isDisable(Object obj) {
+		Object val = getFieldValue(obj,GlobalConstant.VALID_PROPERTY);
+		return YesOrNoEnum.NO.getTextCode().equals(val);
+	}
+	
 
 	public Object getFieldValue(Object entity,String field) {
 		if(entity==null) return null;
 		LogFieldInfo fieldInfo = this.fieldMap.get(field);
-		return BeanUtils.getFieldValue(fieldInfo.getField(),entity);
+		return fieldInfo==null?null:BeanUtils.getFieldValue(fieldInfo.getField(),entity);
 	}
 	
 	public Object getFieldValue(Object entity,Field field) {

itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/utils/DataLogTools.java

@@ -382,7 +382,7 @@ public class DataLogTools {
 		LogTableInfo tabInfo = getAnnotation(klazz);
 		BaseMapper mapper = MybatisTools.getMapper(tabInfo.getEntityType());
 		T old = findById(klazz, id);
-		if(old==null) return null;
+		if(old==null || tabInfo.isEnable(old)) return null;
 		DataOperationContent<T> content = null;
 		if(listener!=null) {
 			content = DataOperationContent.of(tabInfo,OperationType.ENABLE,old,old);
@@ -391,7 +391,6 @@ public class DataLogTools {
 		T entity = null;
 		try {
 			List<DataChangeLog> logs = CollectionUtils.newArrayList();
-			CommonCallUtils.enableBefore(tabInfo.getTableName(),id);
 			entity = findById(klazz, id);
 			content.setObj(entity);
 			DataChangeLog datalog = createLog(klazz,OperationType.ENABLE);
@@ -432,7 +431,7 @@ public class DataLogTools {
 		LogTableInfo tabInfo = getAnnotation(klazz);
 		BaseMapper mapper = MybatisTools.getMapper(tabInfo.getEntityType());
 		T old = findById(klazz, id);
-		if(old==null) return null;
+		if(old==null || tabInfo.isDisable(old)) return null;
 		DataOperationContent<T> content = null;
 		if(listener!=null) {
 			content = DataOperationContent.of(tabInfo,OperationType.DISABLE,old,old);
@@ -442,7 +441,6 @@ public class DataLogTools {
 		T entity = null;
 		try {
 			List<DataChangeLog> logs = CollectionUtils.newArrayList();
-			CommonCallUtils.enableBefore(tabInfo.getTableName(),id);
 			entity = findById(klazz, id);
 			content.setObj(entity);
 			DataChangeLog datalog = createLog(klazz,OperationType.DISABLE);

itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/BankController.java

@@ -152,7 +152,7 @@ public class BankController {
     @ApiOperation(value = "启用")
     @SaCheckPermission("bank:enable")
     public R enable(@Valid @RequestBody List<Long> ids){
-    		return R.ok(bankService.enable(ids));
+    		return R.ok(dataService.enable(UpdateLngBBankDto.class,ids));
     }
     
     
@@ -160,7 +160,7 @@ public class BankController {
     @ApiOperation(value = "禁用")
     @SaCheckPermission("bank:disable")
     public R disable(@Valid @RequestBody List<Long> ids){
-    		return R.ok(bankService.disable(ids));
+    		return R.ok(dataService.disable(UpdateLngBBankDto.class,ids));
     }
     
     private void setRegionName(List<LngBBankPageVo> list) {

itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CategoryController.java

@@ -109,6 +109,6 @@ public class CategoryController {
     @ApiOperation(value = "禁用LngBCategory")
     @SaCheckPermission("category:disable")
     public R disable(@Valid @RequestBody List<Long> ids){
-        return R.ok(categoryService.disable(ids));
+        return R.ok(dataService.disable(UpdateLngBCategoryDto.class,ids));
     }
 }

itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CountryRegionController.java

@@ -155,8 +155,7 @@ public class CountryRegionController {
     @ApiOperation(value = "启用")
     @SaCheckPermission("countryRegion:enable")
     public R enable(@Valid @RequestBody List<Long> ids){
-    		return R.ok(countryRegionService.enable(ids));
+    	return R.ok(dataService.enable(UpdateLngBRegionDto.class,ids));
-    		
     }
     
     
@@ -164,7 +163,7 @@ public class CountryRegionController {
     @ApiOperation(value = "禁用")
     @SaCheckPermission("countryRegion:disable")
     public R disable(@Valid @RequestBody List<Long> ids){
-    		return R.ok(countryRegionService.disable(ids));
+    		return R.ok(dataService.disable(UpdateLngBRegionDto.class,ids));
     }
     
     @GetMapping("/child")

itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CurrencyController.java

@@ -105,13 +105,13 @@ public class CurrencyController {
     @ApiOperation(value = "启用LngBCurrency")
     @SaCheckPermission("currency:enable")
     public R enable(@Valid @RequestBody List<Long> ids){
-        return R.ok(currencyService.enable(ids));
+        return R.ok(dataService.enable(UpdateLngBCurrencyDto.class,ids));
     }
 
     @PostMapping("/disable")
     @ApiOperation(value = "禁用LngBCurrency")
     @SaCheckPermission("currency:disable")
     public R disable(@Valid @RequestBody List<Long> ids){
-        return R.ok(currencyService.disable(ids));
+        return R.ok(dataService.disable(UpdateLngBCurrencyDto.class,ids));
     }
 }

itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/DocCpController.java

@@ -1,8 +1,18 @@
 package com.xjrsoft.module.mdm.controller;
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
+import java.util.List;
-import cn.hutool.core.bean.BeanUtil;
+
-import cn.hutool.core.util.StrUtil;
+import javax.validation.Valid;
+
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.xjrsoft.common.model.result.R;
@@ -17,13 +27,13 @@ import com.xjrsoft.module.mdm.entity.LngBDocCp;
 import com.xjrsoft.module.mdm.service.IDocCpService;
 import com.xjrsoft.module.mdm.vo.LngBDocCpPageVo;
 import com.xjrsoft.module.mdm.vo.LngBDocCpVo;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import java.util.List;
 
 /**
 * @title: 公司资质证书
@@ -103,13 +113,13 @@ public class DocCpController {
     @ApiOperation(value = "启用LngBDocCp")
     @SaCheckPermission("docCp:enable")
     public R enable(@Valid @RequestBody List<Long> ids){
-        return R.ok(docCpService.enable(ids));
+        return R.ok(dataService.enable(UpdateLngBDocCpDto.class,ids));
     }
 
     @PostMapping("/disable")
     @ApiOperation(value = "禁用LngBDocCp")
     @SaCheckPermission("docCp:disable")
     public R disable(@Valid @RequestBody List<Long> ids){
-        return R.ok(docCpService.disable(ids));
+    	return R.ok(dataService.disable(UpdateLngBDocCpDto.class,ids));
     }
 }

itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/ExpenseNameController.java

@@ -115,7 +115,7 @@ public class ExpenseNameController {
     @ApiOperation(value = "启用")
     @SaCheckPermission("expenseName:enable")
     public R enable(@Valid @RequestBody List<Long> ids){
-    		return R.ok(expenseNameService.enable(ids));
+    	return R.ok(dataService.enable(UpdateLngBFeeDto.class,ids));
     }
     
     
@@ -123,7 +123,7 @@ public class ExpenseNameController {
     @ApiOperation(value = "禁用")
     @SaCheckPermission("expenseName:disable")
     public R disable(@Valid @RequestBody List<Long> ids){
-    		return R.ok(expenseNameService.disable(ids));
+    	return R.ok(dataService.disable(UpdateLngBFeeDto.class,ids));
     }
 
 }

itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/LNGStationController.java

@@ -1,8 +1,18 @@
 package com.xjrsoft.module.mdm.controller;
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
+import java.util.List;
-import cn.hutool.core.bean.BeanUtil;
+
-import cn.hutool.core.util.StrUtil;
+import javax.validation.Valid;
+
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.pictc.utils.CollectionUtils;
@@ -16,16 +26,15 @@ import com.xjrsoft.module.mdm.dto.LngBStationLngPageDto;
 import com.xjrsoft.module.mdm.dto.UpdateLngBStationLngDto;
 import com.xjrsoft.module.mdm.entity.LngBStationLng;
 import com.xjrsoft.module.mdm.service.ILNGStationService;
-import com.xjrsoft.module.mdm.vo.LngBRegionTreeVo;
 import com.xjrsoft.module.mdm.vo.LngBStationLngPageVo;
 import com.xjrsoft.module.mdm.vo.LngBStationLngVo;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import java.util.List;
 
 /**
 * @title: LNG气源地
@@ -103,14 +112,14 @@ public class LNGStationController {
     @ApiOperation(value = "启用LngBStationLng")
     @SaCheckPermission("lNGStation:enable")
     public R enable(@Valid @RequestBody List<Long> ids){
-        return R.ok(lNGStationService.enable(ids));
+    	return R.ok(dataService.enable(UpdateLngBStationLngDto.class,ids));
     }
 
     @PostMapping("/disable")
     @ApiOperation(value = "禁用LngBStationLng")
     @SaCheckPermission("lNGStation:disable")
     public R disable(@Valid @RequestBody List<Long> ids){
-        return R.ok(lNGStationService.disable(ids));
+    	return R.ok(dataService.disable(UpdateLngBStationLngDto.class,ids));
     }
     
     @GetMapping(value = "/list")

itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PipeGasDownloadPointController.java

@@ -124,7 +124,7 @@ public class PipeGasDownloadPointController {
     @ApiOperation(value = "启用")
     @SaCheckPermission("pipeGasDownloadPoint:enable")
     public R enable(@Valid @RequestBody List<Long> ids){
-    		return R.ok(pipeGasDownloadPointService.enable(ids));
+    	return R.ok(dataService.enable(UpdateLngBStationPngDto.class,ids));
     }
     
     
@@ -132,7 +132,7 @@ public class PipeGasDownloadPointController {
     @ApiOperation(value = "禁用")
     @SaCheckPermission("pipeGasDownloadPoint:disable")
     public R disable(@Valid @RequestBody List<Long> ids){
-    		return R.ok(pipeGasDownloadPointService.disable(ids));
+    	return R.ok(dataService.disable(UpdateLngBStationPngDto.class,ids));
     }
     
     @GetMapping(value = "/datalog")

itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PipelineGgasLineController.java

@@ -110,7 +110,7 @@ public class PipelineGgasLineController {
     @ApiOperation(value = "启用")
     @SaCheckPermission("pipelineGgasLine:enable")
     public R enable(@Valid @RequestBody List<Long> ids){
-    		return R.ok(pipelineGgasLineService.enable(ids));
+    	return R.ok(dataService.enable(UpdateLngBPngLineDto.class,ids));
     }
     
     
@@ -118,7 +118,7 @@ public class PipelineGgasLineController {
     @ApiOperation(value = "禁用")
     @SaCheckPermission("pipelineGgasLine:disable")
     public R disable(@Valid @RequestBody List<Long> ids){
-    		return R.ok(pipelineGgasLineService.disable(ids));
+    	return R.ok(dataService.disable(UpdateLngBPngLineDto.class,ids));
     }
     
     @GetMapping(value = "/datalog")

itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PortController.java

@@ -1,8 +1,18 @@
 package com.xjrsoft.module.mdm.controller;
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
+import java.util.List;
-import cn.hutool.core.bean.BeanUtil;
+
-import cn.hutool.core.util.StrUtil;
+import javax.validation.Valid;
+
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.xjrsoft.common.model.result.R;
@@ -17,13 +27,13 @@ import com.xjrsoft.module.mdm.entity.LngBPort;
 import com.xjrsoft.module.mdm.service.IPortService;
 import com.xjrsoft.module.mdm.vo.LngBPortPageVo;
 import com.xjrsoft.module.mdm.vo.LngBPortVo;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import java.util.List;
 
 /**
 * @title: 港口
@@ -105,13 +115,13 @@ public class PortController {
     @ApiOperation(value = "启用LngBPort")
     @SaCheckPermission("port:enable")
     public R enable(@Valid @RequestBody List<Long> ids){
-        return R.ok(portService.enable(ids));
+        return R.ok(dataService.enable(UpdateLngBPortDto.class,ids));
     }
 
     @PostMapping("/disable")
     @ApiOperation(value = "禁用LngBPort")
     @SaCheckPermission("port:disable")
     public R disable(@Valid @RequestBody List<Long> ids){
-        return R.ok(portService.disable(ids));
+        return R.ok(dataService.disable(UpdateLngBPortDto.class,ids));
     }
 }

itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PriceTermsController.java

@@ -1,8 +1,18 @@
 package com.xjrsoft.module.mdm.controller;
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
+import java.util.List;
-import cn.hutool.core.bean.BeanUtil;
+
-import cn.hutool.core.util.StrUtil;
+import javax.validation.Valid;
+
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.xjrsoft.common.model.result.R;
@@ -17,13 +27,13 @@ import com.xjrsoft.module.mdm.entity.LngBPriceTerm;
 import com.xjrsoft.module.mdm.service.IPriceTermsService;
 import com.xjrsoft.module.mdm.vo.LngBPriceTermPageVo;
 import com.xjrsoft.module.mdm.vo.LngBPriceTermVo;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import java.util.List;
 
 /**
 * @title: 价格条款管理
@@ -105,13 +115,13 @@ public class PriceTermsController {
     @ApiOperation(value = "启用LngBPriceTerm")
     @SaCheckPermission("priceTerms:enable")
     public R enable(@Valid @RequestBody List<Long> ids){
-        return R.ok(priceTermsService.enable(ids));
+        return R.ok(dataService.enable(UpdateLngBPriceTermDto.class,ids));
     }
 
     @PostMapping("/disable")
     @ApiOperation(value = "禁用LngBPriceTerm")
     @SaCheckPermission("priceTerms:disable")
     public R disable(@Valid @RequestBody List<Long> ids){
-        return R.ok(priceTermsService.disable(ids));
+        return R.ok(dataService.disable(UpdateLngBPriceTermDto.class,ids));
     }
 }

itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/TaxRateController.java

@@ -1,38 +1,40 @@
 package com.xjrsoft.module.mdm.controller;
 
-import cn.hutool.core.bean.BeanUtil;
+import java.util.List;
-import cn.hutool.core.util.ObjectUtil;
+
-import cn.hutool.core.util.StrUtil;
+import javax.validation.Valid;
+
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.xjrsoft.common.model.result.R;
-import com.xjrsoft.common.constant.GlobalConstant;
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
-import com.xjrsoft.common.model.result.R;
 import com.xjrsoft.common.utils.VoToColumnUtil;
-import com.xjrsoft.module.mdm.dto.AddLngBTaxDto;
+import com.xjrsoft.module.datalog.service.DatalogService;
-import com.xjrsoft.module.mdm.dto.UpdateLngBTaxDto;
+import com.xjrsoft.module.datalog.vo.DataChangeLogVo;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-
 import com.xjrsoft.module.mdm.dto.LngBTaxPageDto;
-import com.xjrsoft.module.mdm.dto.UpdateLngBFeeDto;
+import com.xjrsoft.module.mdm.dto.UpdateLngBTaxDto;
 import com.xjrsoft.module.mdm.entity.LngBTax;
 import com.xjrsoft.module.mdm.service.ITaxRateService;
 import com.xjrsoft.module.mdm.vo.LngBTaxPageVo;
-
-import com.xjrsoft.module.datalog.service.DatalogService;
-import com.xjrsoft.module.datalog.vo.DataChangeLogVo;
 import com.xjrsoft.module.mdm.vo.LngBTaxVo;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
-import java.util.List;
 
 /**
 * @title: 税率
@@ -115,7 +117,7 @@ public class TaxRateController {
     @ApiOperation(value = "启用")
     @SaCheckPermission("taxRate:enable")
     public R enable(@Valid @RequestBody List<Long> ids){
-    		return R.ok(taxRateService.enable(ids));
+    	return R.ok(dataService.enable(UpdateLngBTaxDto.class,ids));
     }
     
     
@@ -123,7 +125,7 @@ public class TaxRateController {
     @ApiOperation(value = "禁用")
     @SaCheckPermission("taxRate:disable")
     public R disable(@Valid @RequestBody List<Long> ids){
-    		return R.ok(taxRateService.disable(ids));
+    	return R.ok(dataService.disable(UpdateLngBTaxDto.class,ids));
     }
 
 }