Merge branch 'V0.0.3' of http://10.87.21.221:8000/jzyd_yyds/soc into V0.0.3

soc-modules/soc-modules-core/src/main/resources/mapper/safetycheck/CoreSafetyTaskMapper.xml

@@ -197,7 +197,8 @@
         where id = #{id}
     </select>
     <select id="selectCoreSafetyTaskPage" resultType="com.xunmei.core.safetyCheck.domain.CoreSafetyTask">
-        SELECT t.id,
+select  * from (
+SELECT t.id,
         t.title,
         o1.`short_name` as org_name,
         o2.`short_name` as check_org_name,
@@ -259,6 +260,7 @@
                 #{id}
             </foreach>
         </if>
+        ) temp group by temp.id
     </select>
 
     <insert id="insertCoreSafetyTask" parameterType="com.xunmei.core.safetyCheck.domain.CoreSafetyTask">