From db9e568e346c07b574c5fbe59041889309f0642c Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期一, 29 五月 2023 22:09:30 +0800
Subject: [PATCH] 123

---
 zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java |   60 ++++++++++++------------------------------------------------
 1 files changed, 12 insertions(+), 48 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
index 5db6910..6e8139c 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
@@ -15,10 +15,7 @@
 import com.ruoyi.domain.ZInfoUser;
 import com.ruoyi.domain.ZfEvent;
 import com.ruoyi.domain.ZfRelation;
-import com.ruoyi.domain.dto.EmpowerDto;
-import com.ruoyi.domain.dto.Genealogy;
-import com.ruoyi.domain.dto.GenealogyExportDto;
-import com.ruoyi.domain.dto.UserRelationDto;
+import com.ruoyi.domain.dto.*;
 import com.ruoyi.mapper.ZInfoUserMapper;
 import com.ruoyi.service.ZInfoUserService;
 import com.ruoyi.service.ZfRelationService;
@@ -45,6 +42,9 @@
 
     @Autowired
     private ZfRelationService zfRelationService;
+
+    @Autowired
+    private ZInfoUserService zInfoUserService;
 
     @Override
     public AjaxResult selectInfoList(ZInfoUser zInfoUser, Integer pageNum, Integer pageSize) {
@@ -93,55 +93,24 @@
     }
 
     @Override
-    public AjaxResult searchMyRelation(Long userId) {
+    public AjaxResult searchMyRelation() {
+
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        Long userId = user.getUserId();
 
         LambdaQueryWrapper<ZfRelation> lqw = new LambdaQueryWrapper<>();
         lqw.eq(ZfRelation::getMyId,userId);
-        List<ZfRelation> relationList = zfRelationService.list(lqw);
 
-        ArrayList<UserRelationDto> otherUserList = new ArrayList<>();
-
-        relationList.stream().map(
-                (relation)->{
-                    Long otherId = relation.getOtherId();
-                    ZInfoUser otherUser = getById(otherId);
-                    UserRelationDto userRelationDto = new UserRelationDto();
-                    BeanUtils.copyProperties(otherUser,userRelationDto);
-                    userRelationDto.setRelation(relation.getRelation());
-                    userRelationDto.setId(relation.getId());
-                    otherUserList.add(userRelationDto);
-                    return relation;
-                }
-        ).collect(Collectors.toList());
-
-        return AjaxResult.success(otherUserList);
-    }
-
-    /**
-     * 妫�鏌ヤ紶鍏ュ鏂圭殑id鏄惁瀛樺湪
-     * @param zfRelation
-     */
-    private void checkRelation(ZfRelation zfRelation){
-
-        LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
-        lqw.eq(ZInfoUser::getUserId, zfRelation.getOtherId());
-
-        ZInfoUser zInfoUser2 = getOne(lqw);
-        if (zInfoUser2==null){
-            throw new RuntimeException("瀵规柟鐨刬d涓嶅瓨鍦�");
-        }
+        List<ZfRelation> list = zfRelationService.list(lqw);
+        return AjaxResult.success(list);
     }
 
     @Override
     @Transactional
     public AjaxResult addRelation(ZfRelation zfRelation) {
-        checkRelation(zfRelation);
-
-        //鑾峰彇鑷繁鐨刬d骞朵紶鍏�
         SysUser user = SecurityUtils.getLoginUser().getUser();
         Long userId = user.getUserId();
         zfRelation.setMyId(userId);
-
         zfRelationService.save(zfRelation);
         return AjaxResult.success();
     }
@@ -149,19 +118,14 @@
     @Override
     @Transactional
     public AjaxResult updateRelation(ZfRelation zfRelation) {
-        checkRelation(zfRelation);
         zfRelationService.updateById(zfRelation);
         return AjaxResult.success();
     }
 
     @Override
     public AjaxResult deleteRelation(Long[] ids) {
-        boolean flag = zfRelationService.removeByIds(Arrays.asList(ids));
-        if (flag){
-            return AjaxResult.success();
-        }else {
-            return AjaxResult.error();
-        }
+        zfRelationService.removeByIds(Arrays.asList(ids));
+        return AjaxResult.success();
     }
 
     /**

--
Gitblit v1.9.1