|
|
@@ -248,7 +248,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<if test="projectState != null and projectState != ''"> and a.project_state = #{projectState}</if>
|
|
|
<if test="delFlag != null and delFlag != ''"> and a.del_flag = #{delFlag}</if>
|
|
|
<if test="projectStatus != null and projectStatus != ''"> and a.project_status = #{projectStatus}</if>
|
|
|
- <if test="status != null"> and a.status != #{status}</if>
|
|
|
+ <if test="status != null"> and (a.proc_inst_id is null or (a.proc_inst_id is not null and a.status != #{status}) )</if>
|
|
|
<if test="approvalFlag != null and approvalFlag != ''">and a.approval_flag = #{approvalFlag}</if>
|
|
|
<if test="investigateFlag != null and investigateFlag != ''">and a.investigate_flag = #{investigateFlag}</if>
|
|
|
<if test="decisionFlag != null and decisionFlag != ''">and a.decision_flag = #{decisionFlag}</if>
|
