From e4f42a6456fccc8365f35d43a93243e7c4dbef85 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Wed, 22 Jan 2025 09:57:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E5=8A=9E=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bonus/material/basic/domain/ToDoBean.java     | 3 +++
 .../bonus/material/basic/service/impl/ToDoServiceImpl.java | 7 ++++++-
 .../main/resources/mapper/material/basic/ToDoMapper.xml    | 5 ++++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/domain/ToDoBean.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/domain/ToDoBean.java
index 3ed10ae..db637c6 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/domain/ToDoBean.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/domain/ToDoBean.java
@@ -18,6 +18,9 @@ import java.util.Date;
 public class ToDoBean extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "true:出租方  false:承租方")
+    private boolean flag;
+
     /** 任务ID */
     @ApiModelProperty(value = "任务ID")
     private Long taskId;
diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/ToDoServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/ToDoServiceImpl.java
index b91f930..dd63472 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/ToDoServiceImpl.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/ToDoServiceImpl.java
@@ -25,7 +25,12 @@ public class ToDoServiceImpl implements ToDoService {
 
     @Override
     public List<ToDoBean> getToDoList(ToDoBean bean) {
-        bean.setBuyerCompanyId(Math.toIntExact(SecurityUtils.getLoginUser().getSysUser().getCompanyId()));
+        //true:出租方  false:承租方
+        if (bean.isFlag()) {
+            bean.setSellerCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId().intValue());
+        } else {
+            bean.setBuyerCompanyId(Math.toIntExact(SecurityUtils.getLoginUser().getSysUser().getCompanyId()));
+        }
         return toDoMapper.getToDoList(bean);
     }
 
diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/ToDoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/ToDoMapper.xml
index 7aa5a69..84f026e 100644
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/ToDoMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/ToDoMapper.xml
@@ -24,7 +24,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             tt.`status` = '1' and tt.task_status &lt; 20
                 and tt.task_type in (2)
         <if test="buyerCompanyId != null">
-            and tt.buyer_company_id=#{buyerCompanyId} || tt.seller_company_id=#{buyerCompanyId}
+            and tt.buyer_company_id=#{buyerCompanyId}
+        </if>
+        <if test="sellerCompanyId != null">
+            and tt.seller_company_id=#{sellerCompanyId}
         </if>
         <if test="taskTypeId != null  and taskTypeId != ''">
             and tt.task_type=#{taskTypeId}