FullCardClient/src/main/java/com/zhongshu/card/client/model/pay/RechargeSearchParam.java

@@ -25,6 +25,12 @@ public class RechargeSearchParam {
     @Schema(description = "部门名称")
     private String departmentName;
 
+    @Schema(description = "机构id")
+    private String orgId;
+
+    @Schema(description = "部门id")
+    private String departmentId;
+
     @Schema(description = "支付方式")
     private PaymentType paymentType;
 

FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/ExpenseFlowSearchParam.java

@@ -51,6 +51,12 @@ public class ExpenseFlowSearchParam {
     @Schema(description = "机构名称")
     private String userOrgName;
 
+    @Schema(description = "机构id")
+    private String orgId;
+
+    @Schema(description = "部门id")
+    private String departmentId;
+
     @Schema(description = "部门名称")
     private String departmentName;
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/pay/impl/BalanceRechargeOrderDaoImpl.java

@@ -129,6 +129,13 @@ public class BalanceRechargeOrderDaoImpl implements BalanceRechargeOrderDaoExten
             criteria.and("storeUserInfo.departmentName").regex(departmentNamePattern);
         }
 
+        if (StringUtils.isNotBlank(param.getOrgId())){
+            criteria.and("storeUserInfo.orgId").is(param.getOrgId());
+        }
+        if (StringUtils.isNotBlank(param.getDepartmentId())){
+            criteria.and("storeUserInfo.departmentId").is(param.getDepartmentId());
+        }
+
         if (param.getPaymentType()!=null){
             criteria.and("paymentType").is(param.getPaymentType());
         }

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/payment/impl/ExpenseFlowDaoImpl.java

@@ -387,11 +387,19 @@ public class ExpenseFlowDaoImpl extends BaseImpl implements ExpenseFlowDaoExtend
             criteria.and("storeUserInfo.orgName").regex(userOrgNamePattern);
         }
 
+        if (StringUtils.isNotBlank(param.getOrgId())){
+            criteria.and("storeUserInfo.orgId").is(param.getOrgId());
+        }
+
         if (StringUtils.isNotBlank(param.getDepartmentName())){
             Pattern departmentNamePattern = Pattern.compile("^.*" + param.getDepartmentName() + ".*$");
             criteria.and("storeUserInfo.departmentName").regex(departmentNamePattern);
         }
 
+        if (StringUtils.isNotBlank(param.getDepartmentId())){
+            criteria.and("storeUserInfo.departmentId").is(param.getDepartmentId());
+        }
+
         Query query = new Query(criteria);
         query.with(Sort.by(Sort.Direction.DESC, "createTime"));