|
@@ -131,9 +131,10 @@
|
|
|
<when test="request.userId > 0 and request.currentRoleCode == 'REGION_DIRECTOR' ">
|
|
|
AND pu.user_id = #{request.userId,jdbcType=BIGINT}
|
|
|
</when>
|
|
|
- <otherwise>
|
|
|
+ <when test="request.userId !=null">
|
|
|
AND mr.worker_id1 = #{request.userId,jdbcType=BIGINT}
|
|
|
- </otherwise>
|
|
|
+ </when>
|
|
|
+ <otherwise/>
|
|
|
</choose>
|
|
|
<if test="request.status!=null and request.status!=''">
|
|
|
AND mr.status = #{request.status,jdbcType=VARCHAR}
|
|
@@ -171,9 +172,10 @@
|
|
|
<when test="request.userId > 0 and request.currentRoleCode == 'REGION_DIRECTOR' ">
|
|
|
AND pu.user_id = #{request.userId,jdbcType=BIGINT}
|
|
|
</when>
|
|
|
- <otherwise>
|
|
|
+ <when test="request.userId !=null">
|
|
|
AND mr.worker_id1 = #{request.userId,jdbcType=BIGINT}
|
|
|
- </otherwise>
|
|
|
+ </when>
|
|
|
+ <otherwise/>
|
|
|
</choose>
|
|
|
<if test="request.beginTime!=null">
|
|
|
AND <![CDATA[ mr.plan_date >= #{request.beginTime}]]>
|