审批工单接口修改

gic-platform-enterprise-service/src/main/resources/mapper/TabAuditLogMapper.xml

@@ -319,13 +319,21 @@
       </if>
       <if test="auditResult != 3">
         and audit_result = #{auditResult}
+        and audit_expire_time >= now()
       </if>
     </if>
     <if test="search != null and search != '' ">
-      and ( project_item_name like concat('%', #{search},'%')
-      or auditor_name like concat('%', #{search},'%')
+      <if test="searchType == 2">
+        and ( project_item_name like concat('%', #{search},'%')
+        or apply_user_name like concat('%', #{search},'%')
+        )
+      </if>
+      <if test="searchType == 1">
+        and ( project_item_name like concat('%', #{search},'%')
+        or auditor_name like concat('%', #{search},'%')
+        )
+      </if>
 
-      )
     </if>
     order by create_time desc
   </select>