优化品牌接口参数空指针

blade-service/blade-factory/pom.xml

@@ -66,6 +66,14 @@
             <artifactId>hutool-all</artifactId>
             <version>5.8.20</version>
         </dependency>
+
+        <dependency>
+            <groupId>com.gubersail</groupId>
+            <artifactId>gubersail-dealer-admin-api</artifactId>
+            <version>2.8.2.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
+
     </dependencies>
 
     <build>

blade-service/blade-factory/src/main/java/org/springblade/factory/api/controller/SalesOrderController.java

@@ -4,6 +4,8 @@ package org.springblade.factory.api.controller;
 import com.alibaba.cloud.commons.lang.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gubersail.dealer.admin.api.fegin.IBrandClient;
+import com.gubersail.dealer.admin.api.goods.entity.PjBrandDesc;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
@@ -16,10 +18,8 @@ import org.springblade.factory.entity.*;
 import org.springblade.factory.service.*;
 import org.springblade.factory.vo.PcBladeOrderVO;
 import org.springblade.factory.wrapper.PcBladeOrderWrapper;
-import org.springblade.system.feign.ISysClient;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
-import org.springblade.system.user.feign.IUserSearchClient;
 import org.springblade.u9cloud.entity.ZcrmU9cWebapiSo;
 import org.springblade.u9cloud.entity.ZcrmU9cWebapiSoApprove;
 import org.springblade.u9cloud.entity.ZcrmU9cWebapiSoSubmit;
@@ -30,7 +30,6 @@ import org.springblade.core.secure.utils.AuthUtil;
 import springfox.documentation.annotations.ApiIgnore;
 
 import javax.validation.Valid;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -57,6 +56,7 @@ import java.util.Objects;
 @AllArgsConstructor
 public class SalesOrderController {
 
+
 	@Autowired
 	private IUserClient userClient;
 
@@ -604,4 +604,6 @@ public class SalesOrderController {
 	}
 
 
+
+
 }

blade-service/gubersail-dealer-admin/src/main/java/com/gubersail/admin/fegin/BrandClient.java

@@ -43,6 +43,9 @@ public class BrandClient implements IBrandClient {
 	@GetMapping(IBrandClient.GET_DEALER_BRAND_LIST)
 	public List<PjBrandDesc> getDealerBrandList() {
 		BladeUser bladeUser = new BladeUser();
+		System.out.println(bladeUser);
+		bladeUser.setTenantId(AuthUtil.getTenantId());
+
 		return brandDescService.list(new LambdaQueryWrapper<PjBrandDesc>()
 			.eq(PjBrandDesc::getTenantId, bladeUser.getTenantId()).eq(PjBrandDesc::getType, "PP")
 			.eq(PjBrandDesc::getEnableOrNot, 1).eq(PjBrandDesc::getIsDeleted, 0));