dzk 1 anno fa
parent
commit
a05fe24f53

+ 1 - 0
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/BrandController.java

@@ -163,6 +163,7 @@ public class BrandController extends BaseController {
         List<String> addrCode = body.getAddrCode();
         List<String> brandId = body.getBrandId();
         if (brandId == null || brandId.isEmpty()) return R.fail("brandId不允许为空");
+        if (addrCode == null || addrCode.isEmpty()) return R.fail("addrCode不允许为空");
 
         Map<String, List<BrandEvolveVo>> listMap = brandService.searchEvolveByMulti2Map(addrCode, null, brandId);
 

+ 1 - 1
ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/BrandProvinceDao.java

@@ -11,7 +11,7 @@ import java.util.List;
 public interface BrandProvinceDao extends BaseMapper<BrandProvince> {
     List<BrandProvince> searchByBrandId(String brandId);
 
-    List<BrandProvince> searchByBrandIdOrderByProvince(String brandId, String month);
+    List<BrandProvince> searchByBrandIdOrderByProvince(@Param("brandId") String brandId,@Param("month") String month);
 
     void insertAll(@Param("provinces") List<BrandProvince> provinces);