From 5b419f40537fb107cad33c53d3506b47be1282f6 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Mon, 26 Apr 2021 09:37:00 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=89=80=E6=9C=89=E5=B0=8F=E7=BB=84?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=92=E5=BA=8F=E8=B0=83=E6=95=B4=EF=BC=9A?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E6=80=BB=E6=95=B0=EF=BC=8C=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
index 299c7122da..f1b0327b3c 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
@@ -545,7 +545,7 @@
         AND rg.grid_id = #{gridId}
         AND rg.state = 'approved'
         ORDER BY
-            totalMember DESC
+            totalMember DESC, rg.CREATED_TIME DESC
         LIMIT
             #{pageNo}, #{pageSize}
     </select>

From b4417561a26ce363841ab9824ba8abd3dade7863 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Mon, 26 Apr 2021 10:11:29 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=BF=90=E8=90=A5=E7=AB=AF=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E7=AE=A1=E7=90=86=E3=80=81=E5=AE=A2=E6=88=B7=E5=AE=9A?=
 =?UTF-8?q?=E5=88=B6=E5=8C=96=E9=A1=B5=E9=9D=A2=E6=9F=A5=E8=AF=A2=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E6=8C=89=E5=AE=A2=E6=88=B7=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E9=99=8D=E5=BA=8F=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/CustomerDao.xml | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerDao.xml b/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerDao.xml
index 7ef7c8261d..791a9f0aaf 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerDao.xml
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerDao.xml
@@ -69,6 +69,8 @@
         <if test='customerName != "" and customerName != null'>
             AND customer_name LIKE concat('%', trim(#{customerName}), '%')
         </if>
+        ORDER BY
+            created_time DESC
     </select>
 
     <select id="getAllList" resultMap="customerMap">
@@ -106,19 +108,21 @@
 
     <select id="selectAllCustomerList" resultType="com.epmet.dto.result.CustomerListResultDTO">
         SELECT
-        ID AS "customerId",
-        CUSTOMER_NAME,
-        TITLE,
-        VALIDITY_TIME,
-        ORGANIZATION_LEVEL,
-        LOGO,
-        GRID_NUMBER
+            id AS "customerId",
+            customer_name,
+            title,
+            validity_time,
+            organization_level,
+            logo,
+            grid_number
         FROM customer
         WHERE
-        DEL_FLAG = '0'
+            del_flag = '0'
         <if test='customerName != "" and customerName != null'>
             AND customer_name LIKE concat('%', trim(#{customerName}), '%')
         </if>
+        ORDER BY
+            created_time DESC
     </select>
 
     <select id="getExternalAndParentCustomerId" resultType="String">

From 9ede5cee809db85ad0e3f1ac495feb4bda37c12c Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Mon, 26 Apr 2021 10:21:52 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E5=88=86=E4=BA=ABId=E6=9F=A5=E8=AF=A2=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0=E8=BF=94=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../invitation/form/GetInvitationFormDTO.java    |  6 +++++-
 .../result/GetInvitationResultDTO.java           |  6 +++++-
 .../controller/InvitationRecordController.java   |  5 +++--
 .../service/InvitationRecordService.java         |  2 +-
 .../impl/InvitationRecordServiceImpl.java        | 16 +++++++++++++---
 5 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/form/GetInvitationFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/form/GetInvitationFormDTO.java
index 7b6975eb89..36cf7b60d4 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/form/GetInvitationFormDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/form/GetInvitationFormDTO.java
@@ -6,7 +6,7 @@ import javax.validation.constraints.NotBlank;
 
 /**
  * @Author sun
- * @Description 通知、活动分享Id查询数据-接口入参
+ * @Description 根据通知分享Id查询数据-接口入参
  */
 @Data
 public class GetInvitationFormDTO {
@@ -16,6 +16,10 @@ public class GetInvitationFormDTO {
      */
     @NotBlank(message = "分享Id不能为空",groups = {GetInvitationFormDTO.Invitation.class})
     private String invitationRecordId;
+    /**
+     * token中用户Id
+     */
+    private String userId;
 
     public interface Invitation{}
 }
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/GetInvitationResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/GetInvitationResultDTO.java
index 24f2a708f2..4b44e638e7 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/GetInvitationResultDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/GetInvitationResultDTO.java
@@ -6,7 +6,7 @@ import java.io.Serializable;
 
 /**
  * @Author sun
- * @Description 通知、活动分享Id查询数据-接口返参
+ * @Description 根据通知分享Id查询数据-接口返参
  */
 @Data
 public class GetInvitationResultDTO implements Serializable {
@@ -36,5 +36,9 @@ public class GetInvitationResultDTO implements Serializable {
 	 * notice:通知  act:活动
 	 */
 	private String shareUserId;
+	/**
+	 * 当前人员是否在组内:yes；不在组内：no
+	 */
+	private String inGroup = "yes";
 
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/controller/InvitationRecordController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/controller/InvitationRecordController.java
index 05cd2d035a..0e20a8b391 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/controller/InvitationRecordController.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/controller/InvitationRecordController.java
@@ -64,11 +64,12 @@ public class InvitationRecordController {
      * @param formDTO
      * @return
      * @Author sun
-     * @Description 通知、活动分享Id查询数据
+     * @Description 根据通知分享Id查询数据
      **/
     @PostMapping(value = "getinvitation")
-    public Result<GetInvitationResultDTO> getInvitation(@RequestBody GetInvitationFormDTO formDTO) {
+    public Result<GetInvitationResultDTO> getInvitation(@LoginUser TokenDto tokenDto, @RequestBody GetInvitationFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, GetInvitationFormDTO.Invitation.class);
+        formDTO.setUserId(tokenDto.getUserId());
         return new Result<GetInvitationResultDTO>().ok(invitationRecordService.getInvitation(formDTO));
     }
 
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/InvitationRecordService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/InvitationRecordService.java
index e3a243c72d..581dc1c9c4 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/InvitationRecordService.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/InvitationRecordService.java
@@ -45,7 +45,7 @@ public interface InvitationRecordService extends BaseService<InvitationRecordEnt
      * @param formDTO
      * @return
      * @Author sun
-     * @Description 通知、活动分享Id查询数据
+     * @Description 根据通知分享Id查询数据
      **/
     GetInvitationResultDTO getInvitation(GetInvitationFormDTO formDTO);
 
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/InvitationRecordServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/InvitationRecordServiceImpl.java
index 9d05b413b1..5f578aab55 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/InvitationRecordServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/InvitationRecordServiceImpl.java
@@ -18,6 +18,7 @@
 package com.epmet.modules.invitation.service.impl;
 
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.modules.act.dao.GroupActInfoDao;
@@ -25,6 +26,7 @@ import com.epmet.modules.act.entity.GroupActInfoEntity;
 import com.epmet.modules.invitation.dao.InvitationRecordDao;
 import com.epmet.modules.invitation.entity.InvitationRecordEntity;
 import com.epmet.modules.invitation.service.InvitationRecordService;
+import com.epmet.modules.member.dao.ResiGroupMemberDao;
 import com.epmet.modules.notice.dao.NoticeDao;
 import com.epmet.modules.notice.entity.NoticeEntity;
 import com.epmet.resi.group.dto.invitation.InvitationRecordDTO;
@@ -48,6 +50,8 @@ public class InvitationRecordServiceImpl extends BaseServiceImpl<InvitationRecor
     private NoticeDao noticeDao;
     @Autowired
     private GroupActInfoDao groupActInfoDao;
+    @Autowired
+    private ResiGroupMemberDao resiGroupMemberDao;
 
 
     /**
@@ -97,16 +101,22 @@ public class InvitationRecordServiceImpl extends BaseServiceImpl<InvitationRecor
      * @param formDTO
      * @return
      * @Author sun
-     * @Description 通知、活动分享Id查询数据
+     * @Description 根据通知分享Id查询数据
      **/
     @Override
     public GetInvitationResultDTO getInvitation(GetInvitationFormDTO formDTO) {
-        //查询通知、活动分享表数据
+        //1.查询通知、活动分享表数据
         InvitationRecordEntity entity = baseDao.selectById(formDTO.getInvitationRecordId());
         if (null == entity) {
-            throw new RenException(String.format("根据分享Id查询数据失败，分享Id->", formDTO.getInvitationRecordId()));
+            throw new RenException(String.format("根据通知分享Id查询数据失败，分享Id->", formDTO.getInvitationRecordId()));
         }
         GetInvitationResultDTO resultDTO = ConvertUtils.sourceToTarget(entity, GetInvitationResultDTO.class);
+
+        //2.判断当前人员是否在组内
+        int num = resiGroupMemberDao.checkUserInGroup(formDTO.getUserId(), entity.getGroupId());
+        if (num < NumConstant.ONE) {
+            resultDTO.setInGroup("no");
+        }
         return resultDTO;
     }