From ac18acbdf9f0442e05cf4b74a8747c35cd7460f1 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Fri, 28 Apr 2023 09:15:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customer/biz/restrictedbrand/RestrictedBrandRest.java | 2 +-
 .../biz/restrictedbrand/RestrictedBrandService.java       | 8 +++++++-
 .../biz/restrictedcategory/RestrictedCategoryRest.java    | 2 +-
 .../biz/restrictedcategory/RestrictedCategoryService.java | 7 +++++++
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/restrictedbrand/RestrictedBrandRest.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/restrictedbrand/RestrictedBrandRest.java
index 6f4054f4..b82879a4 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/restrictedbrand/RestrictedBrandRest.java
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/restrictedbrand/RestrictedBrandRest.java
@@ -92,7 +92,7 @@ public class RestrictedBrandRest implements RestrictedBrandFeign {
         if(restrictedBrand == null){
             return rb.setMsg("该监管品牌不存在");
         }
-        restrictedBrandService.deleteByid(id);
+        restrictedBrandService.deleteById(id);
         return rb.success();
     }
 
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/restrictedbrand/RestrictedBrandService.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/restrictedbrand/RestrictedBrandService.java
index 37f3e0e4..df26a794 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/restrictedbrand/RestrictedBrandService.java
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/restrictedbrand/RestrictedBrandService.java
@@ -49,7 +49,9 @@ import org.springframework.stereotype.Service;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Project: supervise-customer(客户中心) <br/>
@@ -131,7 +133,11 @@ public class RestrictedBrandService extends MybatisBaseService<RestrictedBrandMa
         qw.eq("id", id);
         return baseMapper.selectOne(qw);
     }
-
+    public int deleteById(String id) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("id", id);
+        return baseMapper.deleteByMap(map);
+    }
     public void readBrandPeriodSorXls1(InputStream is, String sid) {
         HSSFWorkbook hssfWorkbook = null;
         try {
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/restrictedcategory/RestrictedCategoryRest.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/restrictedcategory/RestrictedCategoryRest.java
index 2bb334ef..a6cbf13a 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/restrictedcategory/RestrictedCategoryRest.java
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/restrictedcategory/RestrictedCategoryRest.java
@@ -92,7 +92,7 @@ public class RestrictedCategoryRest implements RestrictedCategoryFeign {
         if(restrictedCategory == null){
             return rb.setMsg("该监管类别不存在");
         }
-        restrictedCategoryService.deleteByid(id);
+        restrictedCategoryService.deleteById(id);
         return rb.success();
     }
 
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/restrictedcategory/RestrictedCategoryService.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/restrictedcategory/RestrictedCategoryService.java
index 1a080c86..f5b229b2 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/restrictedcategory/RestrictedCategoryService.java
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/restrictedcategory/RestrictedCategoryService.java
@@ -51,7 +51,9 @@ import javax.annotation.Resource;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Project: supervise-customer(客户中心) <br/>
@@ -140,6 +142,11 @@ public class RestrictedCategoryService extends MybatisBaseService<RestrictedCate
         BeanUtil.copyProperties(entity, vo);
         return vo;
     }
+    public int deleteById(String id) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("id", id);
+        return baseMapper.deleteByMap(map);
+    }
 
     public RestrictedCategory getRestById(String id) {
         RestrictedCategory entity = fetchById(id);