jms:海运，空运，amend,报关进出口列表接口增加判断，开启动态权限代码中不做任何权限处理

blade-service/blade-los/src/main/java/org/springblade/los/business/aea/controller/AeaBillsController.java

@@ -78,23 +78,6 @@ public class AeaBillsController extends BladeController {
 	@ApiOperation(value = "分页", notes = "传入aeaBills")
 	public R<IPage<AeaBills>> list(AeaBills aeaBills, Query query) {
 		LambdaQueryWrapper<AeaBills> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-		/*lambdaQueryWrapper.select(AeaBills::getId, AeaBills::getBillNo, AeaBills::getBillType, AeaBills::getMasterBillNo,
-			AeaBills::getCorpCnName, AeaBills::getCorpId, AeaBills::getCorpEnName, AeaBills::getCarrierCnName,
-			AeaBills::getCarrierId, AeaBills::getVoyageNo, AeaBills::getMblno, AeaBills::getHblno, AeaBills::getEta, AeaBills::getEtd,
-			AeaBills::getDepartureId, AeaBills::getDepartureCnName, AeaBills::getDestinationId, AeaBills::getDestinationName,
-			AeaBills::getCargoType, AeaBills::getMarks, AeaBills::getQuantity, AeaBills::getGrossWeight,
-			AeaBills::getMeasurement, AeaBills::getIsNeedLand, AeaBills::getIsNeedDeclare, AeaBills::getIsNeedIq, AeaBills::getAmountDr,
-			AeaBills::getAmountCr, AeaBills::getAmountProfit, AeaBills::getAmountDrUsd, AeaBills::getAmountCrUsd, AeaBills::getAmountProfitUsd,
-			AeaBills::getAmountDrLoc, AeaBills::getAmountCrLoc, AeaBills::getAmountProfitLoc, AeaBills::getCheckCrStatusDescr,
-			AeaBills::getCheckDrStatusDescr, AeaBills::getStlCrStatusDescr, AeaBills::getStlDrStatusDescr, AeaBills::getInvoiceCrStatusDescr,
-			AeaBills::getInvoiceDrStatusDescr, AeaBills::getCreateUserName, AeaBills::getCreateTime, AeaBills::getUpdateUserName,
-			AeaBills::getUpdateTime, AeaBills::getStatus, AeaBills::getBillStatus, AeaBills::getAccountStatus, AeaBills::getRemarks,
-			AeaBills::getPackingUnit, AeaBills::getBillDate, AeaBills::getTeamName, AeaBills::getCreateUser, AeaBills::getWarehousingDate,
-			AeaBills::getOutboundDate, AeaBills::getCreateTime, AeaBills::getUpdateUserName, AeaBills::getUpdateTime, AeaBills::getStatus,
-			AeaBills::getBillStatus, AeaBills::getAccountStatus, AeaBills::getRemarks, AeaBills::getPackingUnit,
-			AeaBills::getBillDate, AeaBills::getTeamName, AeaBills::getCreateUser, AeaBills::getCreateDeptName,
-			AeaBills::getCarrierCnName, AeaBills::getCyCnName, AeaBills::getSrcType, AeaBills::getSrcCnName, AeaBills::getBookingAgentCnName,
-			AeaBills::getCarrierEnName, AeaBills::getCyEnName, AeaBills::getDestinationName);*/
 		lambdaQueryWrapper.eq(AeaBills::getIsDeleted, 0)
 			.eq(AeaBills::getTenantId, AuthUtil.getTenantId())
 			.and(i -> i.isNull(AeaBills::getMasterId).or()
@@ -139,6 +122,8 @@ public class AeaBillsController extends BladeController {
 				}
 				lambdaQueryWrapper.eq(AeaBills::getBranchId, deptUtils.getDeptPid());
 			}
+		} else if ("2".equals(jurisdiction)) {
+			//动态权限不做任何处理
 		} else {
 			if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("财务")) {
 				lambdaQueryWrapper.apply("find_in_set(team_id,'" + AuthUtil.getPostId() + "')");

blade-service/blade-los/src/main/java/org/springblade/los/business/aea/mapper/AeaBillsMapper.java

@@ -18,6 +18,7 @@ package org.springblade.los.business.aea.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springblade.los.business.aea.entity.AeaBills;
 import org.springblade.los.business.aea.vo.AeaBillsVO;
@@ -32,6 +33,7 @@ import java.util.Map;
  * @author BladeX
  * @since 2024-01-19
  */
+@Mapper
 public interface AeaBillsMapper extends BaseMapper<AeaBills> {
 
 	/**

blade-service/blade-los/src/main/java/org/springblade/los/business/aea/service/IAeaBillsService.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.los.business.aea.service;
 
+import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.los.business.aea.entity.AeaBills;
 import org.springblade.los.business.aea.vo.AeaBillsVO;

blade-service/blade-los/src/main/java/org/springblade/los/business/aea/service/impl/AeaBillsServiceImpl.java

@@ -23,6 +23,8 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;

blade-service/blade-los/src/main/java/org/springblade/los/business/amends/controller/AmendsController.java

@@ -118,7 +118,9 @@ public class AmendsController extends BladeController {
 				}
 				lambdaQueryWrapper.eq(Amends::getBranchId, deptUtils.getDeptPid());
 			}
-		} else {
+		}else if ("2".equals(jurisdiction)) {
+			//动态权限不做任何处理
+		}  else {
 			if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("财务")) {
 				lambdaQueryWrapper.apply("find_in_set(team_id,'" + AuthUtil.getPostId() + "')");
 			}

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

@@ -174,7 +174,9 @@ public class BillsController extends BladeController {
 				}
 				lambdaQueryWrapper.eq(Bills::getBranchId, deptUtils.getDeptPid());
 			}
-		} else {
+		}else if ("2".equals(jurisdiction)) {
+			//动态权限不做任何处理
+		}  else {
 			if (AuthUtil.getUserRole().contains("业务员")) {
 				lambdaQueryWrapper.eq(Bills::getSrcId, AuthUtil.getUserId());
 			} else {
@@ -299,7 +301,9 @@ public class BillsController extends BladeController {
 				}
 				lambdaQueryWrapper.eq(Bills::getBranchId, deptUtils.getDeptPid());
 			}
-		} else {
+		}else if ("2".equals(jurisdiction)) {
+			//动态权限不做任何处理
+		}  else {
 			if (AuthUtil.getUserRole().contains("业务员")) {
 				lambdaQueryWrapper.eq(Bills::getSrcId, AuthUtil.getUserId());
 			} else {

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/service/impl/BillsServiceImpl.java

@@ -181,8 +181,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 			.eq(Bills::getCreateDept, branchId)
 			.eq(Bills::getTenantId, AuthUtil.getTenantId())
 			.eq(Bills::getIsDeleted, 0)
-			.eq(Bills::getMblno, bills.getMblno())
-			.eq(Bills::getBookingNo, bills.getBookingNo()));
+			.eq(Bills::getMblno, bills.getMblno()));
 		if ("SE".equals(bills.getBusinessType())) {
 			bills.setBillDate(bills.getEtd());
 		} else {

blade-service/blade-los/src/main/java/org/springblade/los/statisticAnalysis/service/impl/StatisticAnalysisServiceImpl.java

@@ -355,7 +355,9 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 				}
 				lambdaQueryWrapper.eq(Bills::getBranchId, deptUtils.getDeptPid());
 			}
-		} else {
+		}else if ("2".equals(jurisdiction)) {
+			//动态权限不做任何处理
+		}  else {
 			if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("财务")) {
 				lambdaQueryWrapper.apply("find_in_set(team_id,'" + AuthUtil.getPostId() + "')");
 			}
@@ -520,7 +522,9 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 				}
 				lambdaQueryWrapper.eq(Bills::getBranchId, deptUtils.getDeptPid());
 			}
-		} else {
+		}else if ("2".equals(jurisdiction)) {
+			//动态权限不做任何处理
+		}  else {
 			if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("财务")) {
 				lambdaQueryWrapper.apply("find_in_set(team_id,'" + AuthUtil.getPostId() + "')");
 			}

blade-service/blade-system/src/main/java/org/springblade/system/controller/MenuController.java

@@ -67,7 +67,7 @@ public class MenuController extends BladeController {
 	 * 详情
 	 */
 	@GetMapping("/detail")
-	@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
+//	@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "详情", notes = "传入menu")
 	public R<MenuVO> detail(Menu menu) {
@@ -83,7 +83,7 @@ public class MenuController extends BladeController {
 		@ApiImplicitParam(name = "code", value = "菜单编号", paramType = "query", dataType = "string"),
 		@ApiImplicitParam(name = "name", value = "菜单名称", paramType = "query", dataType = "string")
 	})
-	@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
+//	@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "列表", notes = "传入menu")
 	public R<List<MenuVO>> list(@ApiIgnore @RequestParam Map<String, Object> menu) {
@@ -99,7 +99,7 @@ public class MenuController extends BladeController {
 		@ApiImplicitParam(name = "code", value = "菜单编号", paramType = "query", dataType = "string"),
 		@ApiImplicitParam(name = "name", value = "菜单名称", paramType = "query", dataType = "string")
 	})
-	@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
+//	@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "懒加载列表", notes = "传入menu")
 	public R<List<MenuVO>> lazyList(Long parentId, @ApiIgnore @RequestParam Map<String, Object> menu) {
@@ -115,7 +115,7 @@ public class MenuController extends BladeController {
 		@ApiImplicitParam(name = "code", value = "菜单编号", paramType = "query", dataType = "string"),
 		@ApiImplicitParam(name = "name", value = "菜单名称", paramType = "query", dataType = "string")
 	})
-	@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
+//	@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "菜单列表", notes = "传入menu")
 	public R<List<MenuVO>> menuList(@ApiIgnore @RequestParam Map<String, Object> menu) {
@@ -131,7 +131,7 @@ public class MenuController extends BladeController {
 		@ApiImplicitParam(name = "code", value = "菜单编号", paramType = "query", dataType = "string"),
 		@ApiImplicitParam(name = "name", value = "菜单名称", paramType = "query", dataType = "string")
 	})
-	@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
+//	@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "懒加载菜单列表", notes = "传入menu")
 	public R<List<MenuVO>> lazyMenuList(Long parentId, @ApiIgnore @RequestParam Map<String, Object> menu) {
@@ -143,7 +143,7 @@ public class MenuController extends BladeController {
 	 * 新增或修改
 	 */
 	@PostMapping("/submit")
-	@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
+//	@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入menu")
 	public R submit(@Valid @RequestBody Menu menu) {
@@ -162,7 +162,7 @@ public class MenuController extends BladeController {
 	 * 删除
 	 */
 	@PostMapping("/remove")
-	@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
+//	@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "删除", notes = "传入ids")
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {