Merge remote-tracking branch 'origin/master'

science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectAuditServiceImpl.java

@@ -81,6 +81,9 @@ public class ComProjectAuditServiceImpl extends BaseServiceImpl<ComProjectAuditD
         if (Objects.nonNull(vo.getProjType())) {
             criteria.eq("proj_type", vo.getProjType());
         }
+        if (Objects.nonNull(vo.getProjClass())) {
+            criteria.eq("proj_class", vo.getProjClass());
+        }
         if (Objects.nonNull(vo.getAppUnitName())) {
             criteria.like("d.unit_name", vo.getAppUnitName());
         }
@@ -123,6 +126,7 @@ public class ComProjectAuditServiceImpl extends BaseServiceImpl<ComProjectAuditD
         }
     }
 
+
     @Override
     public Pagination<ComProjectAuditDTO> getListByPage(ComProjectAuditQueryVO vo) {
         QueryWrapper criteria = new QueryWrapper();