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 62bb848..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 @@ -1,6 +1,7 @@ package com.bonus.material.basic.service.impl; import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.common.security.utils.SecurityUtils; import com.bonus.material.basic.domain.ToDoBean; import com.bonus.material.basic.mapper.ToDoMapper; import com.bonus.material.basic.service.ToDoService; @@ -24,6 +25,7 @@ public class ToDoServiceImpl implements ToDoService { @Override public List getToDoList(ToDoBean bean) { + 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 48dd6dd..bfd285f 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 @@ -10,7 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" tt.`code` as taskCode, tt.task_type as taskTypeId, sd2.dict_label as taskType, - sd3.dict_label as taskEvent, + tt.task_status as taskStatus, tt.create_by as createBy, tt.create_time as createTime, tt.buyer_company_id as buyerCompanyId, @@ -20,7 +20,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM tm_task tt LEFT JOIN sys_dict_data sd2 on sd2.dict_value=tt.task_type - LEFT JOIN sys_dict_data sd3 on sd3.dict_value=tt.task_status LEFT JOIN sys_dept dept1 on dept1.dept_id=tt.buyer_company_id LEFT JOIN sys_dept dept2 on dept2.dept_id=tt.seller_company_id WHERE @@ -28,6 +27,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and sd2.dict_type in ('tm_task_type') and tt.task_type in (2) and tt.task_status in (1,2,3,4,5,10,15,20,99) + + and tt.buyer_company_id=#{buyerCompanyId} || tt.seller_company_id=#{buyerCompanyId} + and tt.task_type=#{taskTypeId}