Merge branch 'dev' of http://git.izouma.com/xiongzhu/raex_back into dev

src/main/java/com/izouma/nineth/repo/AssetRepo.java

@@ -84,7 +84,7 @@ public interface AssetRepo extends JpaRepository<Asset, Long>, JpaSpecificationE
     int updateCDN(Long id, String pic, String model3d, String minterAvatar,
                   String ownerAvatar, String detail);
 
-    Page<Asset> findByUserIdAndStatusAndCompanyIdAndNameLike(Long userId, AssetStatus status, Long companyId, String name, Pageable pageable);
+    Page<Asset> findByUserIdAndStatusAndCompanyIdAndNameLikeAndConsignment(Long userId, AssetStatus status, Long companyId, String name, Pageable pageable, Boolean consignment);
 
     List<Asset> findAllByOasisIdInAndStatusIn(List<Long> oasisIds, List<AssetStatus> assetStatuses);
 

src/main/java/com/izouma/nineth/service/AssetService.java

@@ -1030,12 +1030,14 @@ public class AssetService {
                                                     criteriaBuilder.lessThan(root.get("lockTo"), LocalDateTime.now()))),
                                     // and status = 'NORMAL'
                                     criteriaBuilder.equal(root.get("status"), AssetStatus.NORMAL),
+
+                                    criteriaBuilder.equal(root.get("consignment"), false),
                                     // and has some tagId
                                     root.join("tags").get("id").in(tags.stream().map(Tag::getId).toArray()))
                             .getRestriction(), pageable);
         } else {
-            return assetRepo.findByUserIdAndStatusAndCompanyIdAndNameLike(userId, AssetStatus.NORMAL, companyId,
-                    "%" + commonMatchDTO.getCollectionName() + "%", pageable);
+            return assetRepo.findByUserIdAndStatusAndCompanyIdAndNameLikeAndConsignment(userId, AssetStatus.NORMAL, companyId,
+                    "%" + commonMatchDTO.getCollectionName() + "%", pageable, false);
         }
     }