Merge remote-tracking branch 'origin/master_0929' into master_0929

@@ -174,7 +174,9 @@ public class ContractDistributorStandardController extends DefaultBaseController
             }
         }
 
-        vo.setCreateById(SecurityUtil.getCurrentUser().getId());
+        if (!"DELETED".equals(vo.getStatus())) {
+            vo.setCreateById(SecurityUtil.getCurrentUser().getId());
+        }
 
         PageResult<ContractDistributorStandard> pageResult = contractDistributorStandardService.query(getPageIndex(vo), getPageSize(vo), vo);
 

@@ -172,9 +172,9 @@
             </if>
             <if test="vo.status != null">
                 AND tb.status LIKE CONCAT(#{vo.status}, '%')
-                <if test="vo.status == 'DRAFT' and vo.createById != null">
-                    AND tb.create_by_id = #{vo.createById}
-                </if>
+            </if>
+            <if test="vo.createById != null and vo.createById != ''">
+                AND tb.create_by_id = #{vo.createById}
             </if>
             <if test="vo.type != null">
                 AND tb.type = #{vo.type}