|
|
@@ -321,9 +321,9 @@
|
|
|
<if test="orderQueryVo.orderNo != null and orderQueryVo.orderNo != ''">
|
|
|
and io.orderno = #{orderQueryVo.orderNo}
|
|
|
</if>
|
|
|
-<!-- <if test="orderQueryVo.deptId != null and orderQueryVo.deptId != '' and isTeamLeader">-->
|
|
|
-<!-- and io.deptid like "${orderQueryVo.deptId}%"-->
|
|
|
-<!-- </if>-->
|
|
|
+ <if test="orderQueryVo.deptId != null and orderQueryVo.deptId != '' and isTeamLeader">
|
|
|
+ and io.deptid like "${orderQueryVo.deptId}%"
|
|
|
+ </if>
|
|
|
<if test="orderQueryVo.orderStatus != null and orderQueryVo.orderStatus != ''">
|
|
|
and io.orderstatus = #{orderQueryVo.orderStatus}
|
|
|
</if>
|
|
|
@@ -342,9 +342,9 @@
|
|
|
<if test="orderQueryVo.companyId != null and orderQueryVo.companyId != ''">
|
|
|
and iac.company_id = #{orderQueryVo.companyId}
|
|
|
</if>
|
|
|
-<!-- <if test="orderQueryVo.userId != null and orderQueryVo.userId != '' and isCdy">-->
|
|
|
-<!-- and io.operatorid = #{orderQueryVo.userId}-->
|
|
|
-<!-- </if>-->
|
|
|
+ <if test="orderQueryVo.userId != null and orderQueryVo.userId != '' and isCdy">
|
|
|
+ and io.operatorid = #{orderQueryVo.userId}
|
|
|
+ </if>
|
|
|
<if test="orderQueryVo.userId != null and orderQueryVo.userId != '' and !isTeamLeader">
|
|
|
and io.userid = #{orderQueryVo.userId}
|
|
|
</if>
|
wks