bug

src/main/java/com/huiju/estateagents/entity/TaPersonPositon.java

@@ -1,16 +1,13 @@
 package com.huiju.estateagents.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
-import java.util.List;
 
 /**
  * <p>
@@ -78,6 +75,11 @@ public class TaPersonPositon implements Serializable {
      */
     private String address;
 
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
 
     /**
      * 创建时间

src/main/java/com/huiju/estateagents/service/impl/TdCityServiceImpl.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.TaPersonPositon;
 import com.huiju.estateagents.entity.TdCity;
-import com.huiju.estateagents.mapper.TaOrgCityMapper;
 import com.huiju.estateagents.mapper.TdCityMapper;
 import com.huiju.estateagents.service.ITdCityService;
 import org.apache.commons.lang3.StringUtils;
@@ -91,6 +90,7 @@ public class TdCityServiceImpl extends ServiceImpl<TdCityMapper, TdCity> impleme
                         record.setDistrict(addressComponent.getString("district"));
                         record.setAddress(address);
                         record.setCreateTime(LocalDateTime.now());
+                        record.setOrgId(orgId);
                         Integer positionResult = taPersonService.savePersonPosition(record);
                         logger.info("保存用户位置信息返回：{}", positionResult);
                     } catch (Exception e) {

src/main/resources/mapper/TaPersonMapper.xml

@@ -618,28 +618,26 @@ FROM
 
     <select id="selectCityPerson" resultType="java.util.Map">
         SELECT
-            d.*,
-            count( d.person_id ) AS cityCount
+            a.city AS city,
+            b.shortname AS NAME,
+            b.lng,
+            b.lat,
+            a.cityCount
         FROM
-        (
-            SELECT
-                t.city AS city,
-                b.shortname AS NAME,
-                b.lng,
-                b.lat,
-                t.person_id
-            FROM
-            ( SELECT * FROM ta_person_position ORDER BY create_time asc ) t
-                LEFT JOIN ta_person a ON t.person_id = a.person_id
-                INNER JOIN td_city b ON t.citycode = b.citycode
-            WHERE
-                a.org_id = #{orgId}
-                AND a.person_type IN ( 'customer', 'drift', 'estate agent' )
-            GROUP BY
-                t.person_id
-        ) d
-        GROUP BY
-        d.city
+            (
+                SELECT
+                t.*,
+                count( DISTINCT t.person_id ) AS cityCount
+                FROM
+                ta_person_position t
+                INNER JOIN ta_person s ON s.person_id = t.person_id
+                WHERE
+                t.org_id = #{orgId}
+                GROUP BY
+                t.citycode
+            ) a
+            INNER JOIN td_city b ON b.citycode = a.citycode
+            AND b.leveltype = 2
     </select>
 
     <insert id="savePersonPosition" parameterType="com.huiju.estateagents.entity.TaPersonPositon">
@@ -678,6 +676,9 @@ FROM
             <if test="createTime != null">
                 create_time,
             </if>
+            <if test="orgId != null">
+                org_id,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">
@@ -711,7 +712,10 @@ FROM
                 #{address},
             </if>
             <if test="createTime != null">
-                #{createTime}
+                #{createTime},
+            </if>
+            <if test="orgId != null">
+                #{orgId}
             </if>
         </trim>
     </insert>