From 9001fcbffb5c67562d511d65475cd22f080c3592 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 22 四月 2026 14:19:14 +0800
Subject: [PATCH] feat(customer): 添加客户私海档案管理和类型字段

---
 src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
index 6d291f8..86ec1a1 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.basic.dto.ProductDto;
@@ -73,7 +74,9 @@
         queryWrapper.eq(ProductModel::getProductId, productDto.getId());
         queryWrapper.eq(productDto.getCreateUser() != null, ProductModel::getCreateUser, productDto.getCreateUser());
         queryWrapper.eq(productDto.getDeptId() != null, ProductModel::getDeptId, productDto.getDeptId());
-        queryWrapper.in(productDto.getDeptIds() != null && productDto.getDeptIds().length > 0, ProductModel::getDeptId, Arrays.asList(productDto.getDeptIds()));
+        if (ObjectUtils.isNotEmpty(productDto.getDeptIds())) {
+            queryWrapper.in( ProductModel::getDeptId, Arrays.asList(productDto.getDeptIds()));
+        }
         return productModelMapper.selectList(queryWrapper);
     }
 
@@ -160,4 +163,8 @@
             throw new ServiceException("瀵煎叆澶辫触");
         }
     }
+
+    public Boolean checkProductModelExist(Long productId, String model) {
+        return true;
+    }
 }

--
Gitblit v1.9.3