Merge remote-tracking branch 'cs/master'

assistMg/src/main/java/com/hotent/project/manager/impl/CostProjectTaskManagerImpl.java

@@ -211,6 +211,12 @@ public class CostProjectTaskManagerImpl extends BaseManagerImpl<CostProjectTaskD
                     projectMembersWrapper.like(CostProjectApproval::getProjectMembers, currentUserId);
                 })
         );
+        if (StringUtil.isNotEmpty(req.getAuditedUnitName())) {
+            approvalQueryWrapper.like(CostProjectApproval::getAuditedUnitName,req.getAuditedUnitName());
+        }
+        if (StringUtil.isNotEmpty(req.getProjectName())) {
+            approvalQueryWrapper.like(CostProjectApproval::getProjectName,req.getProjectName());
+        }
 
         List<CostProjectApproval> accessibleApprovals = costProjectApprovalManager.list(approvalQueryWrapper);