工作流查询bug修复

bpm-core/src/main/java/com/srm/bpm/logic/query/list/ApprovedBillQuery.java

@@ -22,6 +22,8 @@ public class ApprovedBillQuery extends DraftBillQuery {
      * 发起人
      */
     private long sender;
+    
+    private String senderName;
 
 
 

bpm-core/src/main/java/com/srm/bpm/logic/query/list/TodoBillQuery.java

@@ -22,6 +22,11 @@ public class TodoBillQuery extends DraftBillQuery {
      * 发起人
      */
     private long sender;
+    
+    /**
+     * 发起人姓名
+     */
+    private String senderName;
 
 
     /**

bpm-core/src/main/resources/mapper/bpm/infra/ToaBillDao.xml

@@ -61,6 +61,7 @@
         LEFT JOIN toa_form tf ON tf.process_id=tp.id AND tf.is_deleted=0
         LEFT JOIN form_setting fs ON fs.form_id=tf.id AND fs.is_deleted=0
         LEFT JOIN process_node_extend pne ON pne.node_id = approver.task_node_key AND pne.is_deleted=0
+        LEFT JOIN sp_user su ON tb.sender = su.id
         WHERE tb.is_deleted = 0 AND tb.status != 0
         <if test="query != null">
             <if test="query.rangeTime != null and  query.rangeTime != ''">
@@ -72,6 +73,9 @@
             <if test="query.sender > 0 ">
                 AND tb.sender = #{query.sender}
             </if>
+            <if test="query.senderName != null and query.senderName != ''">
+                AND su.username like CONCAT('%',#{query.senderName},'%')
+            </if>
             <if test="query.code != null and query.code != ''">
                 AND tb.code LIKE #{query.codeLike}
             </if>
@@ -97,6 +101,7 @@
         brr.is_deleted = 0
         LEFT JOIN toa_form tf ON tf.process_id=tp.id AND tf.is_deleted=0
         LEFT JOIN form_setting fs ON fs.form_id=tf.id AND fs.is_deleted=0
+        LEFT JOIN sp_user su ON tb.sender = su.id
         WHERE tb.is_deleted = 0 AND tb.status in
         <foreach collection="statusList" item="status" separator="," open="(" close=")">
             #{status}
@@ -111,6 +116,9 @@
             <if test="query.sender > 0 ">
                 AND tb.sender = #{query.sender}
             </if>
+            <if test="query.senderName != null and query.senderName != ''">
+                AND su.username like CONCAT('%',#{query.senderName},'%')
+            </if>
             <if test="query.code != null and query.code != ''">
                 AND tb.code like #{query.codeLike}
             </if>