From 410eed616ce86a76ecfbd272be0a4463ac54a517 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 29 三月 2024 19:37:31 +0800
Subject: [PATCH] 刀具模块错误修改

---
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/service/impl/DncProcessCatalogueServiceImpl.java |  237 ++++++++++++++---------------------------------------------
 1 files changed, 56 insertions(+), 181 deletions(-)

diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/service/impl/DncProcessCatalogueServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/service/impl/DncProcessCatalogueServiceImpl.java
index 3d74b86..1f5934b 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/service/impl/DncProcessCatalogueServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/service/impl/DncProcessCatalogueServiceImpl.java
@@ -1,11 +1,5 @@
 package com.qianwen.smartman.modules.dnc.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
-import com.google.common.collect.Sets;
-import java.lang.invoke.SerializedLambda;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -13,16 +7,23 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+
 import org.apache.commons.compress.utils.Lists;
-import com.qianwen.smartman.common.cache.RegionCache;
-import com.qianwen.smartman.common.constant.DncConstant;
-import com.qianwen.smartman.common.utils.ListUtils;
-import com.qianwen.smartman.common.utils.MessageUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.google.common.collect.Sets;
 import com.qianwen.core.log.exception.ServiceException;
 import com.qianwen.core.mp.base.BaseServiceImpl;
 import com.qianwen.core.tool.constant.BladeConstant;
 import com.qianwen.core.tool.node.ForestNodeMerger;
 import com.qianwen.core.tool.utils.Func;
+import com.qianwen.smartman.common.constant.DncConstant;
+import com.qianwen.smartman.common.utils.ListUtils;
+import com.qianwen.smartman.common.utils.MessageUtils;
 import com.qianwen.smartman.modules.cps.vo.ProcessCatalogueTreeVO;
 import com.qianwen.smartman.modules.dnc.convert.DncProcessCatalogueConvert;
 import com.qianwen.smartman.modules.dnc.entity.DncArtBag;
@@ -36,10 +37,6 @@
 import com.qianwen.smartman.modules.dnc.vo.DncCatalogueAndArtBagTreeVO;
 import com.qianwen.smartman.modules.dnc.vo.DncCatalogueAndArtBagVO;
 import com.qianwen.smartman.modules.dnc.vo.DncProcessCatalogueVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 @Service
 /* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/dnc/service/impl/DncProcessCatalogueServiceImpl.class */
@@ -52,154 +49,7 @@
     private IDncArtFileService dncArtFileService;
     private static final Long RANDOM_ID = 234123L;
 
-    private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
-        String implMethodName = lambda.getImplMethodName();
-        boolean z = true;
-        switch (implMethodName.hashCode()) {
-            case -1646483922:
-                if (implMethodName.equals("getCatalogueId")) {
-                    z = false;
-                    break;
-                }
-                break;
-            case -1041904421:
-                if (implMethodName.equals("getParentId")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case -75308287:
-                if (implMethodName.equals("getName")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 98245393:
-                if (implMethodName.equals("getId")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 124572976:
-                if (implMethodName.equals("getAllPath")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 537556537:
-                if (implMethodName.equals("getIsCurrent")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 812940310:
-                if (implMethodName.equals("getArtBagId")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 1342380108:
-                if (implMethodName.equals("getFileType")) {
-                    z = true;
-                    break;
-                }
-                break;
-        }
-        switch (z) {
-            case false:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/DncArtBag") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getCatalogueId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/DncArtBag") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getCatalogueId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/DncArtBag") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getCatalogueId();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/DncArtFile") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getArtBagId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/DncArtFile") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getArtBagId();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/DncArtFile") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getIsCurrent();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/DncProcessCatalogue") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getName();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getId();
-                    };
-                }
-                break;
-            case RegionCache.VILLAGE_LEVEL /* 5 */:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/DncProcessCatalogue") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getAllPath();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/DncProcessCatalogue") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getParentId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/DncProcessCatalogue") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getParentId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/DncProcessCatalogue") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getParentId();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/DncArtFile") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getFileType();
-                    };
-                }
-                break;
-        }
-        throw new IllegalArgumentException("Invalid lambda deserialization");
-    }
+    
 
     @Override // org.springblade.modules.dnc.service.IDncProcessCatalogueService
     public DncProcessCatalogueVO updateName(Long id, String name) {
@@ -228,29 +78,35 @@
     @Override // org.springblade.modules.dnc.service.IDncProcessCatalogueService
     @Transactional(rollbackFor = {Exception.class})
     public boolean remove(List<String> ids) {
-        String id = (String) ListUtils.getFirst(ids);
+        String id = ListUtils.getFirst(ids);
+        Set<String> catalogueIdSets = Sets.newHashSet(listObjs(Wrappers.<DncProcessCatalogue>lambdaQuery().select(DncProcessCatalogue::getId).like(DncProcessCatalogue::getAllPath, id), String::valueOf));
+        /*
         Set<String> catalogueIdSets = Sets.newHashSet(listObjs((Wrapper) Wrappers.lambdaQuery().select(new SFunction[]{(v0) -> {
             return v0.getId();
         }}).like((v0) -> {
             return v0.getAllPath();
-        }, id), String::valueOf));
+        }, id), String::valueOf));*/
         catalogueIdSets.add(id);
-        List<Long> catalogueIds = (List) catalogueIdSets.stream().map((v0) -> {
+        List<Long> catalogueIds = catalogueIdSets.stream().map((v0) -> {
             return Func.toLong(v0);
         }).collect(Collectors.toList());
         removeByIds(catalogueIds);
+        List<Long> bagIds = this.artBagService.listObjs(Wrappers.<DncArtBag>lambdaQuery().select(DncArtBag::getId).in(DncArtBag::getCatalogueId, catalogueIds), bagId -> Long.valueOf(bagId.toString()));
+        /*
         List<Long> bagIds = this.artBagService.listObjs((Wrapper) Wrappers.lambdaQuery().select(new SFunction[]{(v0) -> {
             return v0.getId();
         }}).in((v0) -> {
             return v0.getCatalogueId();
         }, catalogueIds), bagId -> {
             return Long.valueOf(bagId.toString());
-        });
+        });*/
         if (Func.isNotEmpty(bagIds)) {
             this.artBagService.removeByIds(bagIds);
+            this.dncArtFileService.remove(Wrappers.<DncArtFile>lambdaQuery().in(DncArtFile::getArtBagId, bagIds));
+            /*
             this.dncArtFileService.remove((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
                 return v0.getArtBagId();
-            }, bagIds));
+            }, bagIds));*/
             return true;
         }
         return true;
@@ -261,9 +117,12 @@
         if (Func.isEmpty(parentId)) {
             parentId = DncConstant.DNC_DEFAULT_PARENT_ID;
         }
+        
+        List<DncProcessCatalogue> list = list(Wrappers.<DncProcessCatalogue>lambdaQuery().eq(DncProcessCatalogue::getParentId, parentId));
+        /*
         List<DncProcessCatalogue> list = list((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
             return v0.getParentId();
-        }, parentId));
+        }, parentId));*/
         return DncProcessCatalogueConvert.INSTANCE.convert(list);
     }
 
@@ -276,26 +135,30 @@
             groupId = Long.valueOf(Func.toLong(parentId));
         }
         List<DncCatalogueAndArtBagVO> voList = new ArrayList<>();
+        List<DncProcessCatalogue> list = list(Wrappers.<DncProcessCatalogue>lambdaQuery().eq(DncProcessCatalogue::getParentId, parentId));
+        /*
         List<DncProcessCatalogue> list = list((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
             return v0.getParentId();
-        }, parentId));
+        }, parentId));*/
         if (Func.isNotEmpty(list)) {
-            List<DncCatalogueAndArtBagVO> collect = (List) list.stream().map(catalogue -> {
+            List<DncCatalogueAndArtBagVO> collect = list.stream().map(catalogue -> {
                 return DncCatalogueAndArtBagVO.builder().parentId(catalogue.getParentId()).name(catalogue.getName()).id(catalogue.getId()).isGroup(Boolean.TRUE).isArtBag(Boolean.FALSE).build();
             }).collect(Collectors.toList());
             voList.addAll(collect);
         }
         List<DncProcessCatalogue> groupList = list();
         if (Func.isNotEmpty(groupList)) {
-            Map<Long, DncProcessCatalogue> dncProcessCatalogueMap = (Map) list().stream().collect(Collectors.toMap((v0) -> {
+            Map<Long, DncProcessCatalogue> dncProcessCatalogueMap = list().stream().collect(Collectors.toMap((v0) -> {
                 return v0.getId();
             }, Function.identity()));
             if (groupId != null) {
+            	List<DncArtBag> artBagList = this.artBagService.list(Wrappers.<DncArtBag>lambdaQuery().eq(DncArtBag::getCatalogueId, groupId));
+            	/*
                 List<DncArtBag> artBagList = this.artBagService.list((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
                     return v0.getCatalogueId();
-                }, groupId));
+                }, groupId));*/
                 if (Func.isNotEmpty(artBagList)) {
-                    List<DncCatalogueAndArtBagVO> dncCatalogueAndArtBags = (List) artBagList.stream().map(catalogue2 -> {
+                    List<DncCatalogueAndArtBagVO> dncCatalogueAndArtBags = artBagList.stream().map(catalogue2 -> {
                         DncProcessCatalogue dncProcessCatalogue = (DncProcessCatalogue) dncProcessCatalogueMap.get(catalogue2.getCatalogueId());
                         return DncCatalogueAndArtBagVO.builder().id(catalogue2.getCatalogueId()).parentId(dncProcessCatalogue.getParentId()).artId(Func.toStr(catalogue2.getId())).code(catalogue2.getCode()).artName(catalogue2.getName()).isGroup(Boolean.FALSE).isArtBag(Boolean.TRUE).build();
                     }).collect(Collectors.toList());
@@ -310,7 +173,7 @@
     public List<DncCatalogueAndArtBagTreeVO> artBagTree() {
         List<DncProcessCatalogue> list = list();
         List<DncArtBag> artBagList = this.artBagService.list();
-        return ForestNodeMerger.merge((List) Stream.concat(list.stream().map(catalogue -> {
+        return ForestNodeMerger.merge( Stream.concat(list.stream().map(catalogue -> {
             return DncCatalogueAndArtBagTreeVO.builder().parentId(catalogue.getParentId()).name(catalogue.getName()).id(catalogue.getId()).isGroup(Boolean.TRUE).isArtBag(Boolean.FALSE).build();
         }), artBagList.stream().map(catalogue2 -> {
             return DncCatalogueAndArtBagTreeVO.builder().id(catalogue2.getId()).parentId(catalogue2.getCatalogueId()).artId(Func.toStr(catalogue2.getId())).code(catalogue2.getCode()).artName(catalogue2.getName()).isGroup(Boolean.FALSE).isArtBag(Boolean.TRUE).build();
@@ -322,7 +185,7 @@
         List<DncProcessCatalogue> catalogueList = list();
         List<ProcessCatalogueTreeVO> tree = Lists.newArrayList();
         if (Func.isNotEmpty(catalogueList)) {
-            List<ProcessCatalogueTreeVO> res = (List) catalogueList.stream().map(c -> {
+            List<ProcessCatalogueTreeVO> res = catalogueList.stream().map(c -> {
                 ProcessCatalogueTreeVO vo = new ProcessCatalogueTreeVO();
                 Long id = Long.valueOf(c.getId().equals(BladeConstant.TOP_PARENT_ID) ? c.getId().longValue() + RANDOM_ID.longValue() : c.getId().longValue());
                 vo.setId(id);
@@ -333,14 +196,14 @@
                 return vo;
             }).collect(Collectors.toList());
             tree.addAll(res);
-            List<Long> catalogueIds = (List) catalogueList.stream().map((v0) -> {
+            List<Long> catalogueIds = catalogueList.stream().map((v0) -> {
                 return v0.getId();
             }).collect(Collectors.toList());
-            List<DncArtBag> dncArtBags = this.artBagService.list((Wrapper) Wrappers.lambdaQuery(DncArtBag.class).in((v0) -> {
+            List<DncArtBag> dncArtBags = this.artBagService.list(Wrappers.lambdaQuery(DncArtBag.class).in((v0) -> {
                 return v0.getCatalogueId();
             }, catalogueIds));
             if (Func.isNotEmpty(dncArtBags)) {
-                List<ProcessCatalogueTreeVO> bagRes = (List) dncArtBags.stream().map(c2 -> {
+                List<ProcessCatalogueTreeVO> bagRes = dncArtBags.stream().map(c2 -> {
                     ProcessCatalogueTreeVO vo = new ProcessCatalogueTreeVO();
                     vo.setId(c2.getId());
                     Long parentId = Long.valueOf(c2.getCatalogueId().equals(BladeConstant.TOP_PARENT_ID) ? c2.getCatalogueId().longValue() + RANDOM_ID.longValue() : c2.getCatalogueId().longValue());
@@ -351,9 +214,15 @@
                     return vo;
                 }).collect(Collectors.toList());
                 tree.addAll(bagRes);
-                List<Long> bagIds = (List) dncArtBags.stream().map((v0) -> {
+                List<Long> bagIds = dncArtBags.stream().map((v0) -> {
                     return v0.getId();
                 }).collect(Collectors.toList());
+                
+                List<DncArtFile> files = this.dncArtFileService.list(Wrappers.lambdaQuery(DncArtFile.class)
+                        .in(DncArtFile::getArtBagId, bagIds)
+                        .eq(DncArtFile::getFileType, 1)
+                        .eq(DncArtFile::getIsCurrent, DncEnums.CurrentVersion.YES.getCode()));
+                /*
                 List<DncArtFile> files = this.dncArtFileService.list((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery(DncArtFile.class).in((v0) -> {
                     return v0.getArtBagId();
                 }, bagIds)).eq((v0) -> {
@@ -361,8 +230,9 @@
                 }, 1)).eq((v0) -> {
                     return v0.getIsCurrent();
                 }, DncEnums.CurrentVersion.YES.getCode()));
+                */
                 if (Func.isNotEmpty(files)) {
-                    List<ProcessCatalogueTreeVO> fileRes = (List) files.stream().map(c3 -> {
+                    List<ProcessCatalogueTreeVO> fileRes = files.stream().map(c3 -> {
                         ProcessCatalogueTreeVO vo = new ProcessCatalogueTreeVO();
                         vo.setId(c3.getId());
                         vo.setParentId(c3.getArtBagId());
@@ -379,13 +249,18 @@
     }
 
     private void checkName(Long parentId, Long id, String name) {
+    	long count = count(Wrappers.<DncProcessCatalogue>lambdaQuery()
+    	        .eq(DncProcessCatalogue::getParentId, parentId)
+    	        .eq(DncProcessCatalogue::getName, name)
+    	        .ne(Func.isNotEmpty(id), DncProcessCatalogue::getId, id));
+    	/*
         long count = count(((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
             return v0.getParentId();
         }, parentId)).eq((v0) -> {
             return v0.getName();
         }, name)).ne(Func.isNotEmpty(id), (v0) -> {
             return v0.getId();
-        }, id));
+        }, id));*/
         if (count > 0) {
             throw new ServiceException(MessageUtils.message("dnc.process.catalogue.name.already.exists", new Object[0]));
         }

--
Gitblit v1.9.3