From 98952a8142bb16f2aad6b1277100dc75554a3086 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 24 Sep 2021 17:11:20 +0800
Subject: [PATCH] fill

---
 .../dto/epmettduck/result/TDuckListResultDTO.java   |  4 ++++
 .../epmettduck/impl/PrUserProjectServiceImpl.java   |  2 +-
 .../mapper/epmettduck/PrUserProjectDao.xml          | 13 +++++++------
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/TDuckListResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/TDuckListResultDTO.java
index 0874011bce..b58d156a3d 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/TDuckListResultDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/TDuckListResultDTO.java
@@ -1,6 +1,7 @@
 package com.epmet.dataaggre.dto.epmettduck.result;
 
 import com.epmet.commons.tools.constant.NumConstant;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -86,6 +87,9 @@ public class TDuckListResultDTO implements Serializable {
 
     private String createdBy;
 
+    @JsonIgnore
+    private Integer isEveryoneWriteOnceUid;
+
     public TDuckListResultDTO() {
         this.customerId = "";
         this.key = "";
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
index 5d22f94772..6d78893d55 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
@@ -218,7 +218,7 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
         if (!CollectionUtils.isEmpty(records)){
             for (String r : records) {
                 for (TDuckListResultDTO t : result) {
-                    if (r.equals(t.getKey())){
+                    if (t.getIsEveryoneWriteOnceUid() == NumConstant.ONE && r.equals(t.getKey())){
                         t.setFillStatus(true);
                         continue;
                     }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml
index b9e54b758b..541271e826 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml
@@ -82,16 +82,17 @@
 
     <!-- 根据keys查询project -->
     <select id="queryProjectList" resultType="com.epmet.dataaggre.dto.epmettduck.result.TDuckListResultDTO">
-        select * from pr_user_project
-        where del_flag = 0
-        AND status = #{status}
-        AND client = #{client}
-        AND `key` in (
+        select up.*,ps.is_everyone_write_once_uid 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}
+        AND up.client = #{client}
+        AND up.`key` in (
             <foreach collection="keys" item="key" separator=",">
                 #{key}
             </foreach>
             )
-        ORDER BY created_time DESC
+        ORDER BY up.created_time DESC
     </select>
 
 </mapper>
\ No newline at end of file