2024年1月26日14:34:52

blade-service/blade-los/src/main/java/org/springblade/los/basic/corps/controller/BCorpsController.java

@@ -171,7 +171,7 @@ public class BCorpsController extends BladeController {
 		if (AuthUtil.getUserRole().contains("admin") || AuthUtil.getUserRole().contains("secondaryAdmin")) {
 			//管理员、次级管理员查看全部数据
 		} else {
-			lambdaQueryWrapper.apply("find_in_set('" + AuthUtil.getDeptId() + "',branch_id)");
+			lambdaQueryWrapper.apply("find_in_set('" + deptUtils.getDeptPid() + "',branch_id)");
 		}
 		lambdaQueryWrapper.orderByDesc(BCorps::getCreateTime);
 		IPage<BCorps> pages = bCorpsService.page(Condition.getPage(query), lambdaQueryWrapper);
@@ -268,7 +268,7 @@ public class BCorpsController extends BladeController {
 		if (AuthUtil.getUserRole().contains("admin") || AuthUtil.getUserRole().contains("secondaryAdmin")) {
 			//管理员、次级管理员查看全部数据
 		} else {
-			lambdaQueryWrapper.apply("find_in_set('" + AuthUtil.getDeptId() + "',branch_id)");
+			lambdaQueryWrapper.apply("find_in_set('" + deptUtils.getDeptPid() + "',branch_id)");
 		}
 		lambdaQueryWrapper.orderByDesc(BCorps::getCreateTime);
 		List<BCorps> bCorpsList = bCorpsService.list(lambdaQueryWrapper);
@@ -328,7 +328,7 @@ public class BCorpsController extends BladeController {
 		if (AuthUtil.getUserRole().contains("admin") || AuthUtil.getUserRole().contains("secondaryAdmin")) {
 			//管理员、次级管理员查看全部数据
 		} else {
-			lambdaQueryWrapper.apply("find_in_set('" + AuthUtil.getDeptId() + "',branch_id)");
+			lambdaQueryWrapper.apply("find_in_set('" + deptUtils.getDeptPid() + "',branch_id)");
 		}
 		lambdaQueryWrapper.orderByAsc(BCorps::getInitials);
 		IPage<BCorps> pages = bCorpsService.page(Condition.getPage(query), lambdaQueryWrapper);

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

@@ -32,6 +32,7 @@ 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.Func;
+import org.springblade.los.Util.IDeptUtils;
 import org.springblade.los.business.sea.entity.Bills;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -56,6 +57,8 @@ public class AeaBillsController extends BladeController {
 
 	private final IAeaBillsService aeaBillsService;
 
+	private final IDeptUtils deptUtils;
+
 	/**
 	 * 详情
 	 */
@@ -85,7 +88,7 @@ public class AeaBillsController extends BladeController {
 			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::getAccountStatus, AeaBills::getRemarks, AeaBills::getPackingUnit, AeaBills::getBillDate,AeaBills::getTeamName);
 		lambdaQueryWrapper.eq(AeaBills::getIsDeleted, 0)
 			.eq(AeaBills::getTenantId, AuthUtil.getTenantId())
 			.and(i -> i.isNull(AeaBills::getMasterId).or()
@@ -115,6 +118,9 @@ public class AeaBillsController extends BladeController {
 		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("财务")) {
 			lambdaQueryWrapper.apply("find_in_set(team_id,'" + AuthUtil.getPostId() + "')");
 		}
+		if (!AuthUtil.getUserRole().contains("admin")) {
+			lambdaQueryWrapper.eq(AeaBills::getBranchId, deptUtils.getDeptPid());
+		}
 		lambdaQueryWrapper.and(ObjectUtils.isNotNull(aeaBills.getBookingAgentCnName()), i -> i.like(AeaBills::getBookingAgentCnName, aeaBills.getBookingAgentCnName()).or()
 			.like(AeaBills::getBookingAgentEnName, aeaBills.getBookingAgentCnName()))
 			.eq(ObjectUtils.isNotNull(aeaBills.getBillType()), AeaBills::getBillType, aeaBills.getBillType())
@@ -175,6 +181,9 @@ public class AeaBillsController extends BladeController {
 		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("财务")) {
 			lambdaQueryWrapper.apply("find_in_set(team_id,'" + AuthUtil.getPostId() + "')");
 		}
+		if (!AuthUtil.getUserRole().contains("admin")) {
+			lambdaQueryWrapper.eq(AeaBills::getBranchId, deptUtils.getDeptPid());
+		}
 		lambdaQueryWrapper.and(ObjectUtils.isNotNull(aeaBills.getBookingAgentCnName()), i -> i.like(AeaBills::getBookingAgentCnName, aeaBills.getBookingAgentCnName()).or()
 			.like(AeaBills::getBookingAgentEnName, aeaBills.getBookingAgentCnName()))
 			.eq(ObjectUtils.isNotNull(aeaBills.getBillType()), AeaBills::getBillType, aeaBills.getBillType())

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

@@ -1148,6 +1148,9 @@ public class AeaBillsServiceImpl extends ServiceImpl<AeaBillsMapper, AeaBills> i
 		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("财务")) {
 			lambdaQueryWrapper.apply("find_in_set(team_id,'" + AuthUtil.getPostId() + "')");
 		}
+		if (!AuthUtil.getUserRole().contains("admin")) {
+			lambdaQueryWrapper.eq(AeaBills::getBranchId, deptUtils.getDeptPid());
+		}
 		List<AeaBills> billsList = baseMapper.selectList(lambdaQueryWrapper);
 		if (billsList.size() == 0) {
 			throw new RuntimeException("未查到单据信息");

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

@@ -31,6 +31,8 @@ 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.Func;
+import org.springblade.los.Util.IDeptUtils;
+import org.springblade.los.business.aea.entity.AeaBills;
 import org.springblade.los.business.amends.entity.Amends;
 import org.springblade.los.business.amends.service.IAmendsService;
 import org.springblade.los.business.amends.vo.AmendsVO;
@@ -52,6 +54,8 @@ public class AmendsController extends BladeController {
 
 	private final IAmendsService amendsService;
 
+	private final IDeptUtils deptUtils;
+
 	/**
 	 * 详情
 	 */
@@ -95,6 +99,9 @@ public class AmendsController extends BladeController {
 		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("财务")) {
 			lambdaQueryWrapper.apply("find_in_set(team_id,'" + AuthUtil.getPostId() + "')");
 		}
+		if (!AuthUtil.getUserRole().contains("admin")) {
+			lambdaQueryWrapper.eq(Amends::getBranchId, deptUtils.getDeptPid());
+		}
 		IPage<Amends> pages = amendsService.page(Condition.getPage(query), lambdaQueryWrapper);
 		return R.data(pages);
 	}

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

@@ -31,6 +31,7 @@ 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.Func;
+import org.springblade.los.Util.IDeptUtils;
 import org.springblade.los.business.sea.entity.Bills;
 import org.springblade.los.business.sea.service.IBillsService;
 import org.springblade.los.business.sea.vo.BillsVO;
@@ -53,6 +54,8 @@ public class BillsController extends BladeController {
 
 	private final IBillsService billsService;
 
+	private final IDeptUtils deptUtils;
+
 	/**
 	 * 详情
 	 */
@@ -83,7 +86,7 @@ public class BillsController extends BladeController {
 			Bills::getAmountDrLoc, Bills::getAmountCrLoc, Bills::getAmountProfitLoc, Bills::getCheckCrStatusDescr, Bills::getCheckDrStatusDescr,
 			Bills::getStlCrStatusDescr, Bills::getStlDrStatusDescr, Bills::getInvoiceCrStatusDescr, Bills::getInvoiceDrStatusDescr, Bills::getCreateUserName,
 			Bills::getCreateTime, Bills::getUpdateUserName, Bills::getUpdateTime, Bills::getStatus, Bills::getBillStatus,
-			Bills::getAccountStatus, Bills::getRemarks, Bills::getPackingUnit, Bills::getBillDate);
+			Bills::getAccountStatus, Bills::getRemarks, Bills::getPackingUnit, Bills::getBillDate, Bills::getTeamName);
 		lambdaQueryWrapper.eq(Bills::getIsDeleted, 0)
 			.eq(Bills::getTenantId, AuthUtil.getTenantId())
 			.and(i -> i.isNull(Bills::getMasterId).or()
@@ -119,6 +122,9 @@ public class BillsController extends BladeController {
 		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("财务")) {
 			lambdaQueryWrapper.apply("find_in_set(team_id,'" + AuthUtil.getPostId() + "')");
 		}
+		if (!AuthUtil.getUserRole().contains("admin")) {
+			lambdaQueryWrapper.eq(Bills::getBranchId, deptUtils.getDeptPid());
+		}
 		lambdaQueryWrapper.and(ObjectUtils.isNotNull(bills.getBookingAgentCnName()), i -> i.like(Bills::getBookingAgentCnName, bills.getBookingAgentCnName()).or()
 			.like(Bills::getBookingAgentEnName, bills.getBookingAgentCnName()))
 			.eq(ObjectUtils.isNotNull(bills.getIssueType()), Bills::getIssueType, bills.getIssueType())
@@ -176,6 +182,9 @@ public class BillsController extends BladeController {
 		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("财务")) {
 			lambdaQueryWrapper.apply("find_in_set(team_id,'" + AuthUtil.getPostId() + "')");
 		}
+		if (!AuthUtil.getUserRole().contains("admin")) {
+			lambdaQueryWrapper.eq(Bills::getBranchId, deptUtils.getDeptPid());
+		}
 		lambdaQueryWrapper.and(ObjectUtils.isNotNull(bills.getBookingAgentCnName()), i -> i.like(Bills::getBookingAgentCnName, bills.getBookingAgentCnName()).or()
 			.like(Bills::getBookingAgentEnName, bills.getBookingAgentCnName()))
 			.eq(ObjectUtils.isNotNull(bills.getIssueType()), Bills::getIssueType, bills.getIssueType())

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/mapper/BillsMapper.xml

@@ -337,6 +337,9 @@
         <if test='acc.postId != null'>
             and find_in_set(acc.team_id,#{acc.postId})
         </if>
+        <if test='acc.branchId != null'>
+            and find_in_set(acc.branch_id,#{acc.branchId})
+        </if>
         <if test='acc.type != null and acc.type != "" and acc.type == "2"'>
             and acc.amount_dr_loc > acc.stl_amount_dr_loc + fee.applied_amount
         </if>
@@ -667,6 +670,9 @@
         <if test='acc.postId != null'>
             and find_in_set(acc.team_id,#{acc.postId})
         </if>
+        <if test='acc.branchId != null'>
+            and find_in_set(acc.branch_id,#{acc.branchId})
+        </if>
         GROUP BY acc.bill_no
         ORDER BY acc.create_time
     </select>

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

@@ -1436,6 +1436,9 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("财务")) {
 			lambdaQueryWrapper.apply("find_in_set(team_id,'" + AuthUtil.getPostId() + "')");
 		}
+		if (!AuthUtil.getUserRole().contains("admin")) {
+			lambdaQueryWrapper.eq(Bills::getBranchId, deptUtils.getDeptPid());
+		}
 		List<Bills> billsList = baseMapper.selectList(lambdaQueryWrapper);
 		if (billsList.size() == 0) {
 			throw new RuntimeException("未查到单据信息");

blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/service/impl/FinAccBillsServiceImpl.java

@@ -29,6 +29,7 @@ import org.springblade.los.basic.business.entity.BusinessType;
 import org.springblade.los.basic.business.service.IBusinessTypeService;
 import org.springblade.los.billno.entity.BusinessBillNo;
 import org.springblade.los.billno.service.IBusinessBillNoService;
+import org.springblade.los.business.amends.entity.Amends;
 import org.springblade.los.business.sea.entity.Bills;
 import org.springblade.los.business.sea.mapper.BillsMapper;
 import org.springblade.los.finance.fee.entity.FeeCenter;
@@ -134,7 +135,7 @@ public class FinAccBillsServiceImpl extends ServiceImpl<FinAccBillsMapper, FinAc
 		List<FinAccBills> finAccBillsList = new ArrayList<>();
 		String deptId = "";
 		String deptName = "";
-		String branchId = deptUtils.getDeptPid()+"";
+		String branchId = deptUtils.getDeptPid() + "";
 		//获取部门ids对应中文名
 		if (ObjectUtils.isNotNull(AuthUtil.getDeptId())) {
 			deptId = AuthUtil.getDeptId();
@@ -438,6 +439,9 @@ public class FinAccBillsServiceImpl extends ServiceImpl<FinAccBillsMapper, FinAc
 		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("财务")) {
 			finAccBills.setPostId(AuthUtil.getPostId());
 		}
+		if (!AuthUtil.getUserRole().contains("admin")) {
+			finAccBills.setDeptId(deptUtils.getDeptPid());
+		}
 		return billsMapper.listAccBill(finAccBills);
 	}
 

blade-service/blade-los/src/main/java/org/springblade/los/finance/stl/service/impl/FinStlBillsServiceImpl.java

@@ -139,7 +139,7 @@ public class FinStlBillsServiceImpl extends ServiceImpl<FinStlBillsMapper, FinSt
 	public R submit(FinStlBills finStlBills) {
 		String deptId = "";
 		String deptName = "";
-		String branchId = deptUtils.getDeptPid()+"";
+		String branchId = deptUtils.getDeptPid() + "";
 		//获取部门ids对应中文名
 		if (ObjectUtils.isNotNull(AuthUtil.getDeptId())) {
 			deptId = AuthUtil.getDeptId();
@@ -1586,6 +1586,7 @@ public class FinStlBillsServiceImpl extends ServiceImpl<FinStlBillsMapper, FinSt
 			ListAccBillVO finAccBills = new ListAccBillVO();
 			finAccBills.setAccId(item.getAccBillId());
 			finAccBills.setPostId(AuthUtil.getPostId());
+			finAccBills.setBranchId(deptUtils.getDeptPid() + "");
 			FinAccBillsVO finAccBillsVO = finAccBillsService.listByAccBillId(finAccBills);
 			if (finAccBillsVO != null) {
 				item.setAppliedAmount(finAccBillsVO.getAppliedAmount());