Merge remote-tracking branch 'origin/master'

user_center/src/main/resources/mapper/UserMapper.xml

@@ -128,7 +128,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by a.date_create desc
 	 </select>
     <select id="getUserIdsByOrgId" resultType="int">
-        select id from uims_user a where status=1 and (
+        select distinct id from uims_user a where status=1 and (
         a.DEPT_ORG_ID in
         <foreach collection="list" item="item" open="(" close=")" separator=",">
             #{item}