24282 2 роки тому
батько
коміт
2ec2f4135f

+ 2 - 1
bladex-saas-project/saas-business-tradeerp/src/main/java/com/fjhx/purchase/service/impl/PurchaseContractPdfServiceImpl.java

@@ -250,7 +250,8 @@ public class PurchaseContractPdfServiceImpl implements IPurchaseContractPdfServi
                     Map<String, List<PurchaseContractProduct>> accessoriesMap = accessories.stream().collect(Collectors.groupingBy(PurchaseContractProduct::getParentId));
                     if (MapUtils.isNotEmpty(accessoriesMap) && CollectionUtils.isNotEmpty(accessoriesMap.get(tempProduct.getId()))) {
                         newProducts.addAll(accessoriesMap.get(tempProduct.getId()));
-                    } else if (MapUtils.isNotEmpty(accessoriesMap) && CollectionUtils.isNotEmpty(accessoriesMap.get(tempProduct.getContractProductId()))) {
+                    }
+                    if (MapUtils.isNotEmpty(accessoriesMap) && CollectionUtils.isNotEmpty(accessoriesMap.get(tempProduct.getContractProductId()))) {
                         newProducts.addAll(accessoriesMap.get(tempProduct.getContractProductId()));
                     }
                 }

+ 1 - 1
bladex-saas-project/service-flow/src/main/java/com/fjhx/service/example/impl/ExampleInfoServiceImpl.java

@@ -85,7 +85,7 @@ public class ExampleInfoServiceImpl extends ServiceImpl<ExampleInfoMapper, Examp
                         .eq("ei.handle_object_type", ProcessNodeHandleObjectTypeEnum.ALL.getType())
                         .or(e -> e
                                 .eq("ei.handle_object_type", ProcessNodeHandleObjectTypeEnum.USER.getType())
-                                .like("ei.handle_object_id_set", userId))
+                                .eq("ei.handle_object_id_set", userId))
                         .or(e -> e
                                 .eq("ei.handle_object_type", ProcessNodeHandleObjectTypeEnum.ROLE.getType())
                                 .and(w -> {