update

core/src/main/java/com/mooctest/crowd/domain/dao/ResourceDao.java

@@ -7,6 +7,7 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.data.repository.PagingAndSortingRepository;
 

core/src/main/java/com/mooctest/crowd/domain/repository/CommonRepo.java

@@ -60,9 +60,6 @@ public class CommonRepo {
     private  CompetitionsDao competitionsDao;
 
     @Autowired
-    private  ResourceTypeDao resourceTypeDao;
-
-    @Autowired
     private CrowdTestProjectDao crowdTestProjectDao;
 
     public List<TestType> getAllTestType(){
@@ -164,6 +161,7 @@ public class CommonRepo {
         Specifications<ResourcePO> where =  Specifications.where(getResource(keyword));
         return resourceDao.findAll(where, pageable).map(resourcePO -> Converter.convert(Resource.class, resourcePO));
     }
+
     private Specification<ResourcePO> getResource(String keyword) {
         return new Specification<ResourcePO>() {
             @Override

site/src/main/java/com/mooctest/crowd/site/mediator/impl/WebMediatorImpl.java

@@ -21,6 +21,7 @@ import com.mooctest.crowd.site.mediator.ViewMediator;
 import com.mooctest.crowd.site.service.UploadService;
 import com.mooctest.crowd.site.util.DataUtils;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.codehaus.jettison.json.JSONException;
 import org.codehaus.jettison.json.JSONObject;
 import org.springframework.beans.BeanUtils;
@@ -29,10 +30,16 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.data.jpa.domain.Specifications;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
 import java.awt.*;
 import java.io.File;
 import java.util.*;