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

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/ListStaffResultDTO.java

@@ -13,6 +13,8 @@ import java.util.List;
 public class ListStaffResultDTO implements Serializable {
     private static final long serialVersionUID = 7129564173128153335L;
 
+    //工作人员所属组织Id
+    private String agencyId = "";
     //工作人员用户id
     private String staffId = "";
     //工作人员姓名

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java

@@ -460,7 +460,10 @@ public class EpmetUserServiceImpl implements EpmetUserService {
         List<StaffOrgNameResultDTO> orgList = govOrgService.getStaffOrgName(staffIdList);
 
         //3.封装数据并返回
-        resultList.forEach(re -> orgList.stream().filter(l -> re.getStaffId().equals(l.getStaffId())).forEach(s -> re.setOrgName(s.getOrgName())));
+        resultList.forEach(re -> orgList.stream().filter(l -> re.getStaffId().equals(l.getStaffId())).forEach(s -> {
+            re.setAgencyId(s.getAgencyId());
+            re.setOrgName(s.getOrgName());
+        }));
 
         return resultList;
     }

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

@@ -29,7 +29,7 @@
           <if test="null != receiverGroupId and receiverGroupId !=''">
             and irg.id=#{receiverGroupId}
           </if>
-          order by irg.CREATED_TIME asc,igr.id asc
+          order by irg.CREATED_TIME desc
     </select>
 
     <!--  我创建的组内所有的人  -->

epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/InfoGroupReceiversDao.xml

@@ -16,7 +16,6 @@
             <foreach collection="groupIdList" item="groupId" separator="," open="(" close=")">
                 #{groupId}
             </foreach>
-            )
         </if>
     </select>