huangjy 4 éve
szülő
commit
808ed3966d

+ 1 - 4
approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/facade/ApproveFacade.java

@@ -193,10 +193,7 @@ public class ApproveFacade implements IApproveFacade {
         unfinishSearchable.addSearchFilter("state",SearchOperator.eq,ApproveWorkFlowTaskStateEnum.UN_FINISH.getValue());
         Integer unfinishQty = approveService.queryApproveQty(unfinishSearchable);
         //查询我的请求数量
-        Searchable myRequestSearchable = Searchable.newSearchable();
-        myRequestSearchable.addSearchFilter("applicantIdcard",SearchOperator.eq, getCurrentUserId());
-        myRequestSearchable.addSearchFilter("isDeleted",SearchOperator.eq, YesNoEnum.NO.getValue());
-        Integer myRequestQty = approveService.queryMyRequestQty(myRequestSearchable);
+        Integer myRequestQty = approveService.queryMyRequestQty();
         //返回数据封装
         PersonDataVo personDataVo = new PersonDataVo();
         personDataVo.setFinishQty(finishQty.toString());

+ 1 - 1
approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/service/IApproveService.java

@@ -91,7 +91,7 @@ public interface IApproveService {
      * 获取我的请求数量
      * @return
      */
-    Integer queryMyRequestQty(Searchable searchable);
+    Integer queryMyRequestQty();
 
     /**
      * 获取流程类别列表

+ 2 - 2
approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/service/impl/ApproveService.java

@@ -868,14 +868,14 @@ public class ApproveService implements IApproveService {
     /**
      * 获取我的请求数量
      *
-     * @param searchable
      * @return
      */
     @Override
-    public Integer queryMyRequestQty(Searchable searchable) {
+    public Integer queryMyRequestQty() {
         //获取表单列表
         LambdaQueryWrapper<ApproveRecordInfo> where = Wrappers.lambdaQuery();
         where.eq(ApproveRecordInfo::getCreateUser, getCurrentUserId());
+        where.eq(ApproveRecordInfo::getIsDeleted, YesNoEnum.NO.getValue());
         return approveRecordMapper.selectCount(where);
 
     }