Browse Source

1.华翰海运进出口导出检索问题修改

纪新园 2 days ago
parent
commit
c3c709afa5

+ 3 - 3
blade-service/blade-los/src/main/java/org/springblade/los/business/sea/controller/BillsController.java

@@ -155,7 +155,7 @@ public class BillsController extends BladeController {
 			lambdaQueryWrapper.ge(Bills::getEta, bills.getEtaList().get(0));
 			lambdaQueryWrapper.le(Bills::getEta, bills.getEtaList().get(1));
 		}
-		String jurisdiction = sysClient.getParamService("data.jurisdiction");
+		String jurisdiction = sysClient.getParamServiceDWT("data.jurisdiction", AuthUtil.getTenantId());
 		if ("1".equals(jurisdiction)) {
 			lambdaQueryWrapper.eq(ObjectUtils.isNotNull(bills.getSrcType()), Bills::getSrcType, bills.getSrcType())
 				.and(ObjectUtils.isNotNull(bills.getSrcCnName()), i -> i.like(Bills::getSrcCnName, bills.getSrcCnName()).or()
@@ -345,7 +345,7 @@ public class BillsController extends BladeController {
 			lambdaQueryWrapper.ge(Bills::getEta, bills.getEtaList().get(0));
 			lambdaQueryWrapper.le(Bills::getEta, bills.getEtaList().get(1));
 		}
-		String jurisdiction = sysClient.getParamService("data.jurisdiction");
+		String jurisdiction = sysClient.getParamServiceDWT("data.jurisdiction", AuthUtil.getTenantId());
 		if ("1".equals(jurisdiction)) {
 			if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")
 				&& !AuthUtil.getUserRole().contains("副总") && !AuthUtil.getUserRole().contains("财务")
@@ -801,7 +801,7 @@ public class BillsController extends BladeController {
 			lambdaQueryWrapper.ge(Bills::getEta, bills.getEtaList().get(0));
 			lambdaQueryWrapper.le(Bills::getEta, bills.getEtaList().get(1));
 		}
-		String jurisdiction = sysClient.getParamService("data.jurisdiction");
+		String jurisdiction = sysClient.getParamServiceDWT("data.jurisdiction", AuthUtil.getTenantId());
 		if ("1".equals(jurisdiction)) {
 			if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")
 				&& !AuthUtil.getUserRole().contains("副总") && !AuthUtil.getUserRole().contains("财务")