sunkean 3 лет назад
Родитель
Сommit
9969b6bf60

+ 1 - 1
src/main/java/com/izouma/nineth/config/MetaConstants.java

@@ -10,7 +10,7 @@ public interface MetaConstants {
 
     String META_BAG_COLLECTION_NAME = "META_BAG_COLLECTION_NAME";
 
-    String META_CAN_USE_COLLECTION_ID = "META_CAN_USE_COLLECTION_ID";
+    String META_CAN_USE_COLLECTION_NAME = "META_CAN_USE_COLLECTION_NAME";
 
     String META_LUCKY_DRAW_ID = "META_LUCKY_DRAW_ID";
 

+ 14 - 6
src/main/java/com/izouma/nineth/web/MetaUserBagController.java

@@ -43,12 +43,20 @@ public class MetaUserBagController {
         List<MetaUserProp> metaUserProps = metaUserPropRepo.findByUserIdAndDel(userId, false);
         String names = metaParamsConfigService.getString(MetaConstants.META_BAG_COLLECTION_NAME);
         List<MetaBagAssetDTO> metaBagAssetDTOS = queryAsset(names, userId);
-        String id = metaParamsConfigService.getString(MetaConstants.META_CAN_USE_COLLECTION_ID);
-        if (StringUtils.isNotBlank(id)) {
-            List<String> ids = Arrays.asList(id.split(MetaConstants.COMMA));
-            metaBagAssetDTOS.forEach(metaBagAssetDTO -> {
-                metaBagAssetDTO.setCanUse(ids.contains(String.valueOf(metaBagAssetDTO.getCollectionId())));
-            });
+        String canUseName = metaParamsConfigService.getString(MetaConstants.META_CAN_USE_COLLECTION_NAME);
+        if (StringUtils.isBlank(canUseName)) {
+            return MetaRestResult.returnSuccess(new MetaUserBagDTO(metaBagAssetDTOS, metaUserProps));
+        }
+        String[] canUseNameList = canUseName.split(MetaConstants.COMMA);
+        for (MetaBagAssetDTO metaBagAssetDTO :
+                metaBagAssetDTOS) {
+            for (String s :
+                    canUseNameList) {
+                if (metaBagAssetDTO.getName().contains(s)) {
+                    metaBagAssetDTO.setCanUse(Boolean.TRUE);
+                    break;
+                }
+            }
         }
         return MetaRestResult.returnSuccess(new MetaUserBagDTO(metaBagAssetDTOS, metaUserProps));
     }