From 69052b92829757a71e01cbebe9b1ebc94213cef3 Mon Sep 17 00:00:00 2001
From: Administrator <ard@qq.com>
Date: 星期二, 01 八月 2023 14:27:27 +0800
Subject: [PATCH] 优化获取所有app用户pc-app用户在线状态可能为空的问题

---
 ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java |   55 +++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java b/ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java
index 29c1389..a6b4d80 100644
--- a/ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java
@@ -9,8 +9,10 @@
 import com.ruoyi.app.tasktext.domain.ArdAppTaskText;
 import com.ruoyi.app.tasktext.mapper.ArdAppTaskTextMapper;
 import com.ruoyi.common.annotation.DataScope;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.system.mapper.SysUserMapper;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -39,6 +41,8 @@
     private ArdAppTaskMapper ardAppTaskMapper;
     @Resource
     private ArdAppTaskTextMapper ardAppTaskTextMapper;
+    @Resource
+    private SysUserMapper sysUserMapper;
 
     /**
      * 鏌ヨapp浠诲姟绠＄悊
@@ -48,7 +52,19 @@
      */
     @Override
     public ArdAppTask selectArdAppTaskById(String id) {
-        return ardAppTaskMapper.selectArdAppTaskById(id);
+        ArdAppTask ardAppTask = ardAppTaskMapper.selectArdAppTaskById(id);
+        List<String> userIds = ardAppTaskMapper.selectArdAppTaskDetailUserIdsByTaskId(id);
+        if (userIds.size() > 0) {
+            ardAppTask.setUserIds(userIds);
+            List<SysUser> sysUserList=new ArrayList<>();
+            for (String userId : userIds) {
+                SysUser sysUser = sysUserMapper.selectUserById(userId);
+                sysUserList.add(sysUser);
+            }
+            ardAppTask.setSysUserList(sysUserList);
+
+        }
+        return ardAppTask;
     }
 
     @Override
@@ -70,7 +86,6 @@
      * @return app浠诲姟绠＄悊
      */
     @Override
-    @DataScope(deptAlias = "d", userAlias = "u")
     public List<ArdAppTask> selectArdAppTaskList(ArdAppTask ardAppTask) {
         return ardAppTaskMapper.selectArdAppTaskList(ardAppTask);
     }
@@ -83,20 +98,13 @@
      */
     @Override
     public List<ArdAppTask> selectArdAppTaskListWithDetail(ArdAppTask ardAppTask) {
-        ardAppTask.setUserId(SecurityUtils.getUserId());
-        List<ArdAppTask> list1 = ardAppTaskMapper.selectArdAppTaskListWithDetail(ardAppTask);
-        List<ArdAppTask> list = new ArrayList<>();
-        list.addAll(list1);
+        List<ArdAppTask> list = ardAppTaskMapper.selectArdAppTaskListWithDetail(ardAppTask);
         return list;
-
     }
 
     @Override
     public List<ArdAppTask> selectArdAppTaskListWithDetailById(ArdAppTask ardAppTask) {
-        ardAppTask.setUserId(SecurityUtils.getUserId());
-        List<ArdAppTask> list1 = ardAppTaskMapper.selectArdAppTaskListWithDetailById(ardAppTask);
-        List<ArdAppTask> list = new ArrayList<>();
-        list.addAll(list1);
+        List<ArdAppTask> list = ardAppTaskMapper.selectArdAppTaskListWithDetail(ardAppTask);
         return list;
     }
 
@@ -111,7 +119,7 @@
     public int insertArdAppTask(ArdAppTask ardAppTask) {
         ardAppTask.setId(IdUtils.simpleUUID());
         ardAppTask.setUserId(SecurityUtils.getUserId());
-        ardAppTask.setCreateBy(SecurityUtils.getUsername());
+        ardAppTask.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName());
         ardAppTask.setCreateTime(DateUtils.getNowDate());
         int rows = ardAppTaskMapper.insertArdAppTask(ardAppTask);
         insertArdAppTaskPic(ardAppTask);
@@ -281,4 +289,27 @@
             }
         }
     }
+
+    @Override
+    public ArdAppTask selectNewArdAppTaskByUserId(String userId) {
+        ArdAppTask ardAppTask = ardAppTaskMapper.selectNewArdAppTaskByUserId(userId);
+        if (StringUtils.isNotNull(ardAppTask)) {
+            ArdAppTaskDetail detail = new ArdAppTaskDetail();
+            detail.setViewFlag("1");
+            detail.setTaskId(ardAppTask.getId());
+            int i = ardAppTaskMapper.updateArdAppTaskDetailByTaskId(detail);
+        }
+        return ardAppTask;
+    }
+
+    /**
+     * 鏌ヨ宸插脊绐椾絾鏈鐨勪换鍔℃暟閲�
+     *
+     * @param userId app鐢ㄦ埛Id
+     * @return 缁撴灉
+     */
+    @Override
+    public int selectUnreadArdAppTaskCount(String userId) {
+        return ardAppTaskMapper.selectUnreadArdAppTaskCount(userId);
+    }
 }

--
Gitblit v1.9.3