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

platform-dao/src/main/resources/mapper/repair/RepairApplicationFormMapper.xml

@@ -291,16 +291,16 @@
                 </foreach>
             </if>
             <if test="userId!=null and userId!=''">
-                form.user_id=#{userId}
+                and form.user_id=#{userId}
             </if>
             <if test="repairUserId!=null and repairUserId!=''">
-                form.repair_user_id=#{repairUserId}
+                and form.repair_user_id=#{repairUserId}
             </if>
             <if test="dispatchUserId!=null and dispatchUserId!=''">
-                form.dispatch_user_id=#{dispatchUserId}
+                and form.dispatch_user_id=#{dispatchUserId}
             </if>
             <if test="deptId!=null and deptId!=null">
-                dept.dept_id=#{deptId}
+                and dept.dept_id=#{deptId}
             </if>
         </where>
         group by status