From 886f058e47b8fdc5a780c923977efe5c854a8d1c Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Sun, 26 Sep 2021 09:18:39 +0800
Subject: [PATCH 1/3] ;

---
 .../java/com/epmet/service/impl/CustomerGridServiceImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
index fbb937f2ba..727d1536da 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
@@ -297,7 +297,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Result deleteGrid(TokenDto tokenDto,DeleteGridFormDTO deleteGridFormDTO) {
-        redisUtils.delete(RedisKeys.getGridInfoKey(deleteGridFormDTO.getGridId()))
+        redisUtils.delete(RedisKeys.getGridInfoKey(deleteGridFormDTO.getGridId()));
         List<UserIdDTO> userIdDTOS = baseDao.selectUserIdByGrid(deleteGridFormDTO.getGridId());
         deleteGridFormDTO.setUserId(tokenDto.getUserId());
         if (userIdDTOS.size()==0){

From 38144d04472478e1828273d66eb0d150ec5d914d Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Sun, 26 Sep 2021 14:19:27 +0800
Subject: [PATCH 2/3] emm

---
 .../src/main/resources/mapper/epmettduck/PrUserProjectDao.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 541271e826..e1eb771b64 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,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.*,ps.is_everyone_write_once_uid 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}

From fe2d6178cecb516a0ae3bf513ca66fe9597a1019 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Sun, 26 Sep 2021 14:28:45 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=80=BC=200?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/epmettduck/PrUserProjectDao.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 e1eb771b64..a22d98b11d 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,7 +82,7 @@
 
     <!-- 根据keys查询project -->
     <select id="queryProjectList" resultType="com.epmet.dataaggre.dto.epmettduck.result.TDuckListResultDTO">
-        select up.*,ps.is_everyone_write_once_uid as isEveryoneWriteOnceUid 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}