lyhzzz 1 year ago
parent
commit
6e3e068a8b

+ 1 - 10
src/main/java/com/cdf/controller/back/BrandController.java

@@ -41,16 +41,7 @@ public class BrandController {
 
     @GetMapping("updateBrandInfo")
     public ResultData updateBrandInfo() throws Exception {
-        new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    brandService.updateBrandInfo();
-                } catch (Exception e) {
-                    throw new RuntimeException(e);
-                }
-            }
-        }.run();
+        brandService.updateBrandInfo();
         return ResultData.ok();
     }
 

+ 1 - 1
src/main/java/com/cdf/service/impl/BrandServiceImpl.java

@@ -97,7 +97,7 @@ public class BrandServiceImpl extends ServiceImpl<IBrandMapper, Brand> implement
         this.saveOrUpdateBatch(saveList);
 
         List<String> delList = new ArrayList<>();
-        Set<String> cdfBrandIds = saveList.stream().map(Brand::getCdfBrandId).collect(Collectors.toSet());
+        Set<String> cdfBrandIds = allBrand.stream().map(CdfBrand::getBrand_id).collect(Collectors.toSet());
         Set<String> dbBrandIds = list.stream().map(Brand::getCdfBrandId).collect(Collectors.toSet());
         for (String dbBrandId : dbBrandIds) {
             if(!cdfBrandIds.contains(dbBrandId)){