Merge branch 'dev' into ecp

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

@@ -327,7 +327,8 @@ public class SalesOrderController {
 		} else {
 			// 3. 非物料查询时，应用个人订单过滤（仅查看自己的订单）
 			Long userId = AuthUtil.getUserId();
-			queryWrapper.eq("CUSTOMER_ID", userId);
+			R<User> user = userClient.userInfoById(userId);
+			queryWrapper.eq("CUSTOMER_ID", user.getData().getCustomerId());
 		}
 
 		// 4. 处理通用查询参数

blade-service/blade-factory/src/main/java/org/springblade/factory/service/impl/ZcrmViewCustomerSelServiceImpl.java

@@ -58,7 +58,7 @@ public class ZcrmViewCustomerSelServiceImpl extends BaseServiceImpl<ZcrmViewCust
 
 		// 缓存未命中则查询数据库
 		QueryWrapper<ViewCustomerSel> queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("customer_id", customerId);
+		queryWrapper.eq("Customer_ID", customerId);
 		ViewCustomerSel customerSel = this.getOne(queryWrapper);
 
 		// 查询结果不为空则存入缓存