diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskWorkloadMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskWorkloadMapper.xml index 862407b3..c69ed97b 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskWorkloadMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskWorkloadMapper.xml @@ -132,6 +132,9 @@ and res.userid=#{userid} + + and task.cbranch_id=#{branchId} + @@ -163,6 +166,12 @@ and res.userid=#{userid} + + and res.branch_id=#{branchId} + + + and res.ubranch_id=#{ubranchId} + and (res.userid,res.task_id) in @@ -186,6 +195,12 @@ and res.userid=#{userid} + + and e.branch_id=#{branchId} + + + and e.exec_user_branch_id=#{ubranchId} +