# 更新

cost-service/src/main/java/com/blt/other/module/cost/dto/request/CostQueryPageReq.java

@@ -31,9 +31,6 @@ public class CostQueryPageReq extends BaseRequest {
     @ApiModelProperty("1 付款费用 2 收款费用 3 借支/借还")
     private Integer costForm;
 
-    @ApiModelProperty("创建人id")
-    private Integer createUserid;
-
     @ApiModelProperty("费用单状态 0 待提交 1- 待财务审核 2待出纳付款 3被驳回 4已支付 5已作废  6-待部门审核 7-待财务审核 8-待最终审核人审核")
     private String costStatus;
 

cost-service/src/main/resources/mapper/Cost.xml

@@ -282,7 +282,7 @@
         group_concat(distinct t2.username) as cost_current_reviewer
         from cost t1
         left join cost_current_reviewer t2 on t1.cost_no = t2.cost_no
-        <if test=" req.createUserid!=null ">
+        <if test=" req.currentUserId!=null ">
             left join (select t3.oa_user_id, cc.company_no from bailun_other.oa_user t3
             left join user_role_binding urb on t3.oa_user_id = urb.oa_user_id
             left join role_cost_company_binding rccb on urb.role_id = rccb.role_id
@@ -295,7 +295,7 @@
         <if test=" req.costForm!=null and req.costForm != ''">and t1.cost_form= #{req.costForm}</if>
         <if test=" req.isLend!=null and req.isLend != ''">and t1.is_lend=#{req.isLend}</if>
         <if test=" req.companyNo!=null and req.companyNo != ''">and t1.company_no=#{req.companyNo}</if>
-        <if test=" req.createUserid!=null ">and (t1.create_userid=#{req.createUserid} or t.company_no is not null)</if>
+        <if test=" req.currentUserId!=null ">and (t1.create_userid=#{req.createUserid} or t.company_no is not null)</if>
         <if test=" req.costStatus!=null ">and find_in_set(t1.cost_status,#{req.costStatus})</if>
         <if test=" req.lendStatus!=null ">and t1.lend_status=#{req.lendStatus}</if>
         <if test=" req.isTax!=null ">and t1.is_tax=#{req.isTax}</if>

cost-service/src/test/java/com/blt/other/module/cost/service/impl/cost/AbstractCostServiceTest.java

@@ -6,6 +6,7 @@ import com.bailuntec.common.JsonUtilByFsJson;
 import com.blt.other.common.config.property.CostUrlProperties;
 import com.blt.other.database.model.CostCompanyDomain;
 import com.blt.other.module.cost.dao.CostCompanyDao;
+import com.blt.other.module.cost.dto.request.CostQueryPageReq;
 import com.blt.other.module.cost.model.CostDomain;
 import com.blt.other.module.cost.service.CostService;
 import com.blt.other.module.cost.vo.CashierCallbackUrlDataDataVo;
@@ -164,5 +165,14 @@ class AbstractCostServiceTest {
     void cashierCallbackPass() {
     }
 
+    @Rollback
+    @Test
+    void queryPage(){
+        CostQueryPageReq req = new CostQueryPageReq();
+        req.setCurrentUserId(3108);
+
+        costService.queryPage(req);
+    }
+
 
 }