From 955fbce6ef52bae47ad6444dd5334561148f32fd Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 19 十二月 2024 15:31:33 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncNoticeServiceImpl.java |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncNoticeServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncNoticeServiceImpl.java
index a026c36..c60d1f6 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncNoticeServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncNoticeServiceImpl.java
@@ -60,6 +60,7 @@
         try {
             List<String> users = new ArrayList<>();
             users.add(username);
+
             List<Integer> userIds = new ArrayList<>();
             List<Member > userList = memberMapper.selectList(new QueryWrapper<Member>().lambda()
                     .in(Member::getPhone,users)
@@ -70,6 +71,12 @@
                 userIds.add(tu.getId());
             }else{
                 throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝鏃犳晥璐﹀彿~");
+            }
+            if(userIds.size()>0){
+                //娓呯┖娴峰悍鍏ㄩ儴鐨勪唬鍔炴暟鎹�
+                noticesJoinMapper.delete(new UpdateWrapper<Notices>().lambda()
+                        .eq(Notices::getType, Constants.noticesObjectType.hknotice)
+                        .in(Notices::getUserId, userIds));
             }
             Date date = new Date();
             List<GetTodoListResponse> allHkList = new ArrayList<>();
@@ -143,13 +150,6 @@
                     noticesJoinMapper.insert(list);//鎵归噺鎻掑叆璁板綍
                 }
             }
-             if(userIds.size()>0){
-                 //娓呯┖娴峰悍鍏ㄩ儴鐨勪唬鍔炴暟鎹�
-                 noticesJoinMapper.delete(new UpdateWrapper<Notices>().lambda()
-                         .eq(Notices::getType, Constants.noticesObjectType.hknotice)
-                         .in(Notices::getUserId, userIds));
-             }
-
         }catch (Exception e){
             e.printStackTrace();
         }finally {

--
Gitblit v1.9.3