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

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/message/result/MyReceivedResDTO.java

@@ -17,6 +17,7 @@ import java.util.List;
 public class MyReceivedResDTO implements Serializable {
     private static final long serialVersionUID = 2602131254448130443L;
     private String infoId;
+    private String publishStaffId;
     private String publishStaffName;
     private String publishStaffOrgName;
     private String headPhoto;
@@ -31,5 +32,6 @@ public class MyReceivedResDTO implements Serializable {
     private String publishStaffGender;
 
     private String firstAttId;
+    private Boolean isMine;
 }
 

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetmessage/impl/EpmetMessageServiceImpl.java

@@ -222,12 +222,17 @@ public class EpmetMessageServiceImpl implements EpmetMessageService {
     public List<MyReceivedResDTO> queryMyReceivedList(MySentFormDTO formDTO) {
         PageInfo<MyReceivedResDTO> data = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize())
                 .doSelectPageInfo(() -> infoProfileDao.selectListMyReceived(formDTO.getUserId(),formDTO.getContent()));
-        CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId());
         for(MyReceivedResDTO resDTO: data.getList()){
+            CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), resDTO.getPublishStaffId());
             resDTO.setHeadPhoto(StringUtils.isNotBlank(staffInfoCache.getHeadPhoto()) ? staffInfoCache.getHeadPhoto() : StrConstant.EPMETY_STR);
             resDTO.setPublishStaffGender(String.valueOf(staffInfoCache.getGender()));
             resDTO.setPublishStaffOrgName(staffInfoCache.getTwoOrgName());
             resDTO.setPublishStaffName(staffInfoCache.getRealName());
+            if(resDTO.getPublishStaffId().equals(formDTO.getUserId())){
+                resDTO.setIsMine(true);
+            }else{
+                resDTO.setIsMine(false);
+            }
         }
         return data.getList();
     }

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetmessage/InfoProfileDao.xml

@@ -59,6 +59,7 @@
         <result property="publishTime" column="CREATED_TIME"/>
         <result property="firstAttId" column="first_att_id"/>
         <result property="readFlag" column="READ_FLAG"/>
+        <result property="publishStaffId" column="publish_staff_id"></result>
         <collection property="attachmentList" ofType="com.epmet.commons.tools.dto.form.FileCommonDTO" >
             <result property="name" column="name"/>
             <result property="url" column="url"/>
@@ -74,6 +75,7 @@
             ip.content,
             ii.CREATED_TIME,
             ir.READ_FLAG,
+            ii.publish_staff_id,
             ip.first_att_id,
             ia.ATTACHMENT_NAME AS name,
             ia.ATTACHMENT_FORMAT AS format,