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 db637c6..3ed10ae 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,9 +18,6 @@ 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 dd63472..b91f930 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,12 +25,7 @@ public class ToDoServiceImpl implements ToDoService { @Override public List getToDoList(ToDoBean bean) { - //true:出租方 false:承租方 - if (bean.isFlag()) { - bean.setSellerCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId().intValue()); - } else { - bean.setBuyerCompanyId(Math.toIntExact(SecurityUtils.getLoginUser().getSysUser().getCompanyId())); - } + 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 84f026e..7aa5a69 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,10 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" tt.`status` = '1' and tt.task_status < 20 and tt.task_type in (2) - and tt.buyer_company_id=#{buyerCompanyId} - - - and tt.seller_company_id=#{sellerCompanyId} + and tt.buyer_company_id=#{buyerCompanyId} || tt.seller_company_id=#{buyerCompanyId} and tt.task_type=#{taskTypeId}