Merge branch 'main' of http://10.10.14.176:3000/huanghai/QingLong

src/main/java/com/dsideal/QingLong/Zjcq/Model/ZjcqModel.java

@@ -46,7 +46,7 @@ public class ZjcqModel {
      * @return
      */
     public List<Record> getZjcqList(String lx_ids, String ly_ids) {
-        String sql = "select t1.* from t_zhuanjia_base as t1 inner join t_zhuanjia_base_zc as t2 on t1.person_id=t2.person_id and t2.zc_id in (" + ly_ids + ") where t1.lx_id in (" + lx_ids + ") and t1.b_use=1 order by t1.person_id";
+        String sql = "select distinct t1.* from t_zhuanjia_base as t1 inner join t_zhuanjia_base_zc as t2 on t1.person_id=t2.person_id and t2.zc_id in (" + ly_ids + ") where t1.lx_id in (" + lx_ids + ") and t1.b_use=1 order by t1.person_id";
         List<Record> list = Db.find(sql);
         return list;
     }