Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

src/main/java/com/huiju/estateagents/controller/TaPreselectionRecordController.java

@@ -207,8 +207,7 @@ public class TaPreselectionRecordController extends BaseController {
                                                @RequestParam(value = "customerLocked", required = false) String customerLocked,
                                                @RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
                                                @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-                                               @RequestParam("personId") String personId,
-                                               @RequestParam("source") String source,
+                                               @RequestParam("personId") String personId, String source,
                                                HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         Integer orgId = getOrgId(request);

src/main/resources/mapper/TaPreselectionRecordMapper.xml

@@ -27,6 +27,8 @@
             t.person_id = #{personId}
             AND t.org_id = #{orgId}
         <if test="source == 'raiseChoose'">
+            AND t2.`status` = 1
+            AND t3.`status` = 1
             AND t4.raise_start_time &lt;= now( ) AND t4.raise_end_time &gt;= now( )
         </if>
         <if test="customerLocked == 'mine'">