2022年10月24 17:53

blade-service/blade-stock/src/main/java/org/springblade/stock/controller/StockGoodsController.java

@@ -117,6 +117,8 @@ public class StockGoodsController extends BladeController {
 				List<Long> goodId = goodsDescClient.getGoodId(stockGoods.getCode(), stockGoods.getCname(), null, null, null, null, null);
 				if (CollectionUtils.isNotEmpty(goodId)) {
 					lambdaQueryWrapper.in(StockGoods::getGoodsId, goodId);
+				}else {
+					lambdaQueryWrapper.eq(StockGoods::getGoodsId, stockGoods.getCode());
 				}
 			}
 

blade-service/trade-finance/src/main/java/org/springblade/finance/controller/AccController.java

@@ -121,10 +121,18 @@ public class AccController extends BladeController {
 	@ApiOperation(value = "分页", notes = "传入acc")
 	public R<IPage<Acc>> list(Acc acc, Query query) {
 		LambdaQueryWrapper<Acc> accLambdaQueryWrapper = new LambdaQueryWrapper<>();
-		if (acc.getFlag() != null && acc.getFlag() == 1) {
-			accLambdaQueryWrapper.apply(" Amount > Settlement_Amount");
-		} else if (acc.getFlag() != null && acc.getFlag() == 2) {
-			accLambdaQueryWrapper.apply(" Amount > Invoice_Amount");
+		if (AuthUtil.getTenantId().equals("577435")){
+			if (acc.getFlag() != null && acc.getFlag() == 1) {
+				accLambdaQueryWrapper.apply(" Amount > Settlement_Amount");
+			} else if (acc.getFlag() != null && acc.getFlag() == 2) {
+				accLambdaQueryWrapper.apply(" Amount > Invoice_Amount");
+			}
+		}else {
+			if (acc.getFlag() != null && acc.getFlag() == 1) {
+				accLambdaQueryWrapper.apply(" Amount >= Settlement_Amount");
+			} else if (acc.getFlag() != null && acc.getFlag() == 2) {
+				accLambdaQueryWrapper.apply(" Amount >= Invoice_Amount");
+			}
 		}
 		accLambdaQueryWrapper.between(StringUtils.isNotBlank(acc.getCreateStartDate()) && StringUtils.isNotBlank(acc.getCreateEndDate()), Acc::getCreateTime, acc.getCreateStartDate(), acc.getCreateEndDate())
 			.like(StringUtils.isNotBlank(acc.getBillType()), Acc::getBillType, acc.getBillType())