问题处理

hx-oa/src/main/java/com/fjhx/oa/service/external/impl/ExternalAddressBookServiceImpl.java

@@ -59,10 +59,13 @@ public class ExternalAddressBookServiceImpl extends ServiceImpl<ExternalAddressB
         for (ExternalAddressBook externalAddressBook :externalAddressBookList){
             externalAddressBook.setContactsId(externalAddressBookDto.getContactsId());
         }
-        List<Long> externalAddressBookIds = externalAddressBookList.stream().filter(item-> ObjectUtil.isNotEmpty(item.getId())).map(ExternalAddressBook::getId).collect(Collectors.toList());
-        if(ObjectUtil.isNotEmpty(externalAddressBookIds)) {
-            remove(q -> q.notIn(ExternalAddressBook::getId, externalAddressBookIds).eq(ExternalAddressBook::getContactsId, externalAddressBookDto.getContactsId()));
-        }
+//        List<Long> externalAddressBookIds = externalAddressBookList.stream().filter(item-> ObjectUtil.isNotEmpty(item.getId())).map(ExternalAddressBook::getId).collect(Collectors.toList());
+//        if(ObjectUtil.isNotEmpty(externalAddressBookIds)) {
+//            remove(q -> q.notIn(ExternalAddressBook::getId, externalAddressBookIds).eq(ExternalAddressBook::getContactsId, externalAddressBookDto.getContactsId()));
+//        }else{
+//            remove(q -> q.eq(ExternalAddressBook::getContactsId, externalAddressBookDto.getContactsId()));
+//        }
+        this.editLinked(externalAddressBookList,ExternalAddressBook::getContactsId,externalAddressBookDto.getContactsId());
         saveOrUpdateBatch(externalAddressBookList);
     }
 

hx-oa/src/main/java/com/fjhx/oa/service/internal/impl/InternalAddressBookServiceImpl.java

@@ -1,20 +1,19 @@
 package com.fjhx.oa.service.internal.impl;
 
-import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.common.constant.SourceConstant;
+import com.fjhx.oa.entity.internal.dto.InternalAddressBookDto;
 import com.fjhx.oa.entity.internal.po.InternalAddressBook;
 import com.fjhx.oa.entity.internal.vo.SysUserVo;
 import com.fjhx.oa.mapper.internal.InternalAddressBookMapper;
 import com.fjhx.oa.service.internal.InternalAddressBookService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.system.service.impl.SysUserServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.fjhx.oa.entity.internal.dto.InternalAddressBookDto;
-import cn.hutool.core.bean.BeanUtil;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
@@ -27,7 +26,7 @@ import java.util.stream.Collectors;
  * 内部通讯录 服务实现类
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-04
  */
 @DS(SourceConstant.OA)
@@ -51,7 +50,7 @@ public class InternalAddressBookServiceImpl extends ServiceImpl<InternalAddressB
         List<Long> userIds = sysUserVoList.stream().map(SysUser::getUserId).collect(Collectors.toList());
         List<InternalAddressBook> list = list(q -> q.in(InternalAddressBook::getUserId, userIds));
         Map<Long, List<InternalAddressBook>> internalAddressBookMap = list.stream().collect(Collectors.groupingBy(InternalAddressBook::getUserId));
-        for (SysUserVo sysUserVo : sysUserVoList){
+        for (SysUserVo sysUserVo : sysUserVoList) {
             List<InternalAddressBook> internalAddressBook = internalAddressBookMap.get(sysUserVo.getUserId());
             sysUserVo.setInternalAddressBookList(internalAddressBook);
         }
@@ -73,16 +72,17 @@ public class InternalAddressBookServiceImpl extends ServiceImpl<InternalAddressB
     @Override
     public void edit(InternalAddressBookDto internalAddressBookDto) {
         List<InternalAddressBook> internalAddressBookList = internalAddressBookDto.getInternalAddressBookList();
-        for (InternalAddressBook internalAddressBook :internalAddressBookList){
+        for (InternalAddressBook internalAddressBook : internalAddressBookList) {
             internalAddressBook.setUserId(internalAddressBookDto.getUserId());
         }
-        List<Long> internalAddressBookIds = internalAddressBookList.stream().filter(item-> ObjectUtil.isNotEmpty(item.getId())).map(InternalAddressBook::getId).collect(Collectors.toList());
-        if(ObjectUtil.isNotEmpty(internalAddressBookIds)) {
-            remove(q -> q.notIn(InternalAddressBook::getId, internalAddressBookIds).eq(InternalAddressBook::getUserId, internalAddressBookDto.getUserId()));
-        }else{
-            //如果传的列表为空直接全部删除
-            remove(q -> q.eq(InternalAddressBook::getUserId, internalAddressBookDto.getUserId()));
-        }
+//        List<Long> internalAddressBookIds = internalAddressBookList.stream().filter(item-> ObjectUtil.isNotEmpty(item.getId())).map(InternalAddressBook::getId).collect(Collectors.toList());
+//        if(ObjectUtil.isNotEmpty(internalAddressBookIds)) {
+//            remove(q -> q.notIn(InternalAddressBook::getId, internalAddressBookIds).eq(InternalAddressBook::getUserId, internalAddressBookDto.getUserId()));
+//        }else{
+//            //如果传的列表为空直接全部删除
+//            remove(q -> q.eq(InternalAddressBook::getUserId, internalAddressBookDto.getUserId()));
+//        }
+        this.editLinked(internalAddressBookList, InternalAddressBook::getUserId, internalAddressBookDto.getUserId());
         saveOrUpdateBatch(internalAddressBookList);
     }