1.华翰海运进出口增加检索条件

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

@@ -34,7 +34,6 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.los.Util.IDeptUtils;
-import org.springblade.los.app.dto.ProfitCustomersSort;
 import org.springblade.los.business.release.entity.SeaReleaseBillItems;
 import org.springblade.los.business.sea.entity.Bills;
 import org.springblade.los.business.sea.entity.SeaBillsDetail;
@@ -173,12 +172,16 @@ public class BillsController extends BladeController {
 				if (AuthUtil.getUserRole().contains("操作经理")) {
 					lambdaQueryWrapper.and(i -> i.eq(Bills::getOperatorDept, AuthUtil.getDeptId()).or()
 						.eq(Bills::getCreateUser, AuthUtil.getUserId()));
+					lambdaQueryWrapper.eq(ObjectUtils.isNotNull(bills.getOperatorId()), Bills::getOperatorId, bills.getOperatorId());
+					lambdaQueryWrapper.eq(ObjectUtils.isNotNull(bills.getCustomerServiceId()), Bills::getCustomerServiceId, bills.getCustomerServiceId());
 				} else if (AuthUtil.getUserRole().contains("操作员")) {
 					lambdaQueryWrapper.and(i -> i.eq(Bills::getOperatorId, AuthUtil.getUserId()).or()
 						.eq(Bills::getCreateUser, AuthUtil.getUserId()));
 				} else if (AuthUtil.getUserRole().contains("销售经理")) {
 					lambdaQueryWrapper.and(i -> i.eq(Bills::getSrcDeptId, AuthUtil.getDeptId()).or()
 						.eq(Bills::getCreateUser, AuthUtil.getUserId()));
+					lambdaQueryWrapper.eq(ObjectUtils.isNotNull(bills.getOperatorId()), Bills::getOperatorId, bills.getOperatorId());
+					lambdaQueryWrapper.eq(ObjectUtils.isNotNull(bills.getCustomerServiceId()), Bills::getCustomerServiceId, bills.getCustomerServiceId());
 				} else if (AuthUtil.getUserRole().contains("业务员")) {
 					lambdaQueryWrapper.and(i -> i.eq(Bills::getSrcId, AuthUtil.getUserId()).or()
 						.eq(Bills::getCreateUser, AuthUtil.getUserId()));
@@ -189,6 +192,9 @@ public class BillsController extends BladeController {
 					lambdaQueryWrapper.eq(Bills::getCreateUser, AuthUtil.getUserId());
 				}
 				lambdaQueryWrapper.eq(Bills::getBranchId, deptUtils.getDeptPid());
+			} else {
+				lambdaQueryWrapper.eq(ObjectUtils.isNotNull(bills.getOperatorId()), Bills::getOperatorId, bills.getOperatorId());
+				lambdaQueryWrapper.eq(ObjectUtils.isNotNull(bills.getCustomerServiceId()), Bills::getCustomerServiceId, bills.getCustomerServiceId());
 			}
 		} else if ("2".equals(jurisdiction)) {
 			//动态权限不做任何处理
@@ -347,12 +353,16 @@ public class BillsController extends BladeController {
 				if (AuthUtil.getUserRole().contains("操作经理")) {
 					lambdaQueryWrapper.and(i -> i.eq(Bills::getOperatorDept, AuthUtil.getDeptId()).or()
 						.eq(Bills::getCreateUser, AuthUtil.getUserId()));
+					lambdaQueryWrapper.eq(ObjectUtils.isNotNull(bills.getOperatorId()), Bills::getOperatorId, bills.getOperatorId());
+					lambdaQueryWrapper.eq(ObjectUtils.isNotNull(bills.getCustomerServiceId()), Bills::getCustomerServiceId, bills.getCustomerServiceId());
 				} else if (AuthUtil.getUserRole().contains("操作员")) {
 					lambdaQueryWrapper.and(i -> i.eq(Bills::getOperatorId, AuthUtil.getUserId()).or()
 						.eq(Bills::getCreateUser, AuthUtil.getUserId()));
 				} else if (AuthUtil.getUserRole().contains("销售经理")) {
 					lambdaQueryWrapper.and(i -> i.eq(Bills::getSrcDeptId, AuthUtil.getDeptId()).or()
 						.eq(Bills::getCreateUser, AuthUtil.getUserId()));
+					lambdaQueryWrapper.eq(ObjectUtils.isNotNull(bills.getOperatorId()), Bills::getOperatorId, bills.getOperatorId());
+					lambdaQueryWrapper.eq(ObjectUtils.isNotNull(bills.getCustomerServiceId()), Bills::getCustomerServiceId, bills.getCustomerServiceId());
 				} else if (AuthUtil.getUserRole().contains("业务员")) {
 					lambdaQueryWrapper.and(i -> i.eq(Bills::getSrcId, AuthUtil.getUserId()).or()
 						.eq(Bills::getCreateUser, AuthUtil.getUserId()));
@@ -363,6 +373,9 @@ public class BillsController extends BladeController {
 					lambdaQueryWrapper.eq(Bills::getCreateUser, AuthUtil.getUserId());
 				}
 				lambdaQueryWrapper.eq(Bills::getBranchId, deptUtils.getDeptPid());
+			} else {
+				lambdaQueryWrapper.eq(ObjectUtils.isNotNull(bills.getOperatorId()), Bills::getOperatorId, bills.getOperatorId());
+				lambdaQueryWrapper.eq(ObjectUtils.isNotNull(bills.getCustomerServiceId()), Bills::getCustomerServiceId, bills.getCustomerServiceId());
 			}
 		} else if ("2".equals(jurisdiction)) {
 			//动态权限不做任何处理
@@ -796,12 +809,16 @@ public class BillsController extends BladeController {
 				if (AuthUtil.getUserRole().contains("操作经理")) {
 					lambdaQueryWrapper.and(i -> i.eq(Bills::getOperatorDept, AuthUtil.getDeptId()).or()
 						.eq(Bills::getCreateUser, AuthUtil.getUserId()));
+					lambdaQueryWrapper.eq(ObjectUtils.isNotNull(bills.getOperatorId()), Bills::getOperatorId, bills.getOperatorId());
+					lambdaQueryWrapper.eq(ObjectUtils.isNotNull(bills.getCustomerServiceId()), Bills::getCustomerServiceId, bills.getCustomerServiceId());
 				} else if (AuthUtil.getUserRole().contains("操作员")) {
 					lambdaQueryWrapper.and(i -> i.eq(Bills::getOperatorId, AuthUtil.getUserId()).or()
 						.eq(Bills::getCreateUser, AuthUtil.getUserId()));
 				} else if (AuthUtil.getUserRole().contains("销售经理")) {
 					lambdaQueryWrapper.and(i -> i.eq(Bills::getSrcDeptId, AuthUtil.getDeptId()).or()
 						.eq(Bills::getCreateUser, AuthUtil.getUserId()));
+					lambdaQueryWrapper.eq(ObjectUtils.isNotNull(bills.getOperatorId()), Bills::getOperatorId, bills.getOperatorId());
+					lambdaQueryWrapper.eq(ObjectUtils.isNotNull(bills.getCustomerServiceId()), Bills::getCustomerServiceId, bills.getCustomerServiceId());
 				} else if (AuthUtil.getUserRole().contains("业务员")) {
 					lambdaQueryWrapper.and(i -> i.eq(Bills::getSrcId, AuthUtil.getUserId()).or()
 						.eq(Bills::getCreateUser, AuthUtil.getUserId()));
@@ -812,6 +829,9 @@ public class BillsController extends BladeController {
 					lambdaQueryWrapper.eq(Bills::getCreateUser, AuthUtil.getUserId());
 				}
 				lambdaQueryWrapper.eq(Bills::getBranchId, deptUtils.getDeptPid());
+			} else {
+				lambdaQueryWrapper.eq(ObjectUtils.isNotNull(bills.getOperatorId()), Bills::getOperatorId, bills.getOperatorId());
+				lambdaQueryWrapper.eq(ObjectUtils.isNotNull(bills.getCustomerServiceId()), Bills::getCustomerServiceId, bills.getCustomerServiceId());
 			}
 		} else if ("2".equals(jurisdiction)) {
 			//动态权限不做任何处理
@@ -999,9 +1019,9 @@ public class BillsController extends BladeController {
 		lambdaQueryWrapper.select(Bills::getId, Bills::getCorpId, Bills::getShortName,
 			Bills::getCorpCnName, Bills::getCorpEnName, Bills::getBillNo, Bills::getVesselCnName,
 			Bills::getVoyageNo, Bills::getMblno, Bills::getHblno, Bills::getEta, Bills::getEtd,
-			Bills::getPolEnName, Bills::getPodEnName,  Bills::getCarrierCnName, Bills::getPodCnName, Bills::getPolCnName,
+			Bills::getPolEnName, Bills::getPodEnName, Bills::getCarrierCnName, Bills::getPodCnName, Bills::getPolCnName,
 			Bills::getVesselEnName, Bills::getCarrierShortName, Bills::getCarrierEnName, Bills::getCyShortName,
-			Bills::getPlaceDeliveryName, Bills::getDestinationName,Bills::getQuantityCntrDescr);
+			Bills::getPlaceDeliveryName, Bills::getDestinationName, Bills::getQuantityCntrDescr);
 
 		// String defTeamId = ObjectUtils.isNotNull(AuthUtil.getPostId()) ? AuthUtil.getPostId().split(",")[0] : "";
 
@@ -1013,7 +1033,7 @@ public class BillsController extends BladeController {
 			.apply("find_in_set(team_id,'" + AuthUtil.getPostId() + "')")
 			.in(Bills::getBillType, Arrays.asList("DD", "MM"))
 			.like(ObjectUtils.isNotNull(bills.getMblno()), Bills::getMblno, bills.getMblno());
-			// .apply(ObjectUtils.isNotNull(bills.getCreateDeptName()), "find_in_set('" + bills.getCreateDeptName() + "',create_dept_name)");
+		// .apply(ObjectUtils.isNotNull(bills.getCreateDeptName()), "find_in_set('" + bills.getCreateDeptName() + "',create_dept_name)");
 		String jurisdiction = sysClient.getParamService("data.jurisdiction");
 		jurisdiction = "2";
 		if ("1".equals(jurisdiction)) {
@@ -1079,7 +1099,7 @@ public class BillsController extends BladeController {
 						.collect(Collectors.toList());
 					if (!feeCenters.isEmpty()) {
 						item.setFeeCenterListAll(feeCenters);
-					}else{
+					} else {
 						item.setFeeCenterListAll(new ArrayList<>());
 					}
 				}