From a2299a6d4a6f99e9c11132138f5d3e9ec68f03ea Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 06 六月 2025 19:19:34 +0800
Subject: [PATCH] 开发更新

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwCustomerServiceImpl.java |   26 +++++++++++++++++++++++---
 1 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwCustomerServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwCustomerServiceImpl.java
index 6f7a36d..f36d94a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwCustomerServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwCustomerServiceImpl.java
@@ -108,6 +108,14 @@
 
     @Override
     public void deleteById(Integer id, LoginUserInfo user) {
+
+        //鏌ヨ瀹㈡埛淇℃伅涓嬫槸鍚﹀瓨鍦ㄤ汉鍛樹俊鎭�
+        if(memberMapper.selectCount(new QueryWrapper<Member>().lambda().eq(Member::getType,Constants.memberType.customer)
+                        .eq(Member::getCustomerId,id)
+                .eq(Member::getIsdeleted,Constants.ZERO))>Constants.ZERO){
+            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀛樺湪浜哄憳淇℃伅鏈垹闄わ紝璇峰厛鍒犻櫎瀹㈡埛涓嬩汉鍛樹俊鎭�!");
+        }
+
         ywCustomerMapper.deleteById(id);
     }
 
@@ -121,6 +129,11 @@
     public void deleteByIdInBatch(List<Integer> ids, LoginUserInfo user) {
         if (CollectionUtils.isEmpty(ids)) {
             return;
+        }
+        if(memberMapper.selectCount(new QueryWrapper<Member>().lambda().eq(Member::getType,Constants.memberType.customer)
+                .in(Member::getCustomerId,ids)
+                .eq(Member::getIsdeleted,Constants.ZERO))>Constants.ZERO){
+            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀛樺湪浜哄憳淇℃伅鏈垹闄わ紝璇峰厛鍒犻櫎瀹㈡埛涓嬩汉鍛樹俊鎭�!");
         }
         ywCustomerMapper.deleteBatchIds(ids);
     }
@@ -175,9 +188,16 @@
     }
 
     @Override
-    public List<YwCustomer> findList(YwCustomer ywCustomer) {
-        QueryWrapper<YwCustomer> wrapper = new QueryWrapper<>(ywCustomer);
-        return ywCustomerMapper.selectList(wrapper);
+    public List<YwCustomer> findList(YwCustomer model) {
+        return ywCustomerMapper.selectJoinList(YwCustomer.class,
+                new MPJLambdaWrapper<YwCustomer>()
+                        .selectAll(YwCustomer.class)
+                        .selectAs(Member::getName,YwCustomer::getMemberName)
+                        .selectAs(Member::getPhone,YwCustomer::getMemberPhone)
+                        .leftJoin(Member.class,Member::getId,YwCustomer::getMemberId)
+                        .eq(YwCustomer::getIsdeleted,Constants.ZERO)
+                        .like(Objects.nonNull(model)&&StringUtils.isNotBlank(model.getName()),YwCustomer::getName,model.getName())
+                        .orderByDesc(YwCustomer::getCreateDate)) ;
     }
   
     @Override

--
Gitblit v1.9.3