Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

java110-db/src/main/resources/mapper/user/UserV1ServiceDaoImplMapper.xml

@@ -163,7 +163,7 @@
     </select>
 
     <select id="queryStaffsNoInOrgCount" parameterType="Map" resultType="Map">
-        select count(1) count
+        select count(DISTINCT t.user_id) count
         from u_user t
         inner join s_store_user su on t.user_id = su.user_id and su.status_cd = '0'
         LEFT JOIN u_org_staff_rel osr on su.user_id = osr.staff_id and osr.status_cd = '0'
@@ -176,7 +176,7 @@
     </select>
 
     <select id="queryStaffsNoInOrg" parameterType="Map" resultType="Map">
-        select t.address,t.sex,t.status_cd,t.status_cd statusCd,t.user_id,t.user_id userId,t.level_cd,t.level_cd
+        select DISTINCT t.address,t.sex,t.status_cd,t.status_cd statusCd,t.user_id,t.user_id userId,t.level_cd,t.level_cd
         levelCd,t.location_cd,t.location_cd locationCd,t.score,t.name,t.tel,t.b_id,t.b_id bId,t.email,t.age
         from u_user t
         inner join s_store_user su on t.user_id = su.user_id and su.status_cd = '0'