Merge remote-tracking branch 'origin/develop' into release_temp

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml

@@ -82,7 +82,7 @@
 
     <!-- 根据keys查询project -->
     <select id="queryProjectList" resultType="com.epmet.dataaggre.dto.epmettduck.result.TDuckListResultDTO">
-        select up.*,ps.is_everyone_write_once_uid from pr_user_project up
+        select up.*,IFNULL(ps.is_everyone_write_once_uid,0) as isEveryoneWriteOnceUid from pr_user_project up
         LEFT JOIN pr_user_project_setting ps ON (ps.project_key = up.`key` AND ps.del_flag = 0)
         where up.del_flag = 0
         AND up.status = #{status}