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

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserInvitationDao.java

@@ -23,6 +23,8 @@ import com.epmet.entity.UserInvitationEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 人员邀请关系表  记录user之间的邀请关系
  *
@@ -41,7 +43,7 @@ public interface UserInvitationDao extends BaseDao<UserInvitationEntity> {
 	 * @Description 根据被邀请人id、邀请链接id、邀请场景查询人员邀请记录
 	 * @Date 2020/4/10 0:36
 	 **/
-	UserInvitationDTO selectUserInvitation(@Param("inviteeUserId") String inviteeUserId,
+	List<UserInvitationDTO> selectUserInvitation(@Param("inviteeUserId") String inviteeUserId,
-										   @Param("inviteSourceId") String inviteSourceId,
+												 @Param("inviteSourceId") String inviteSourceId,
-										   @Param("inviteSource") String inviteSource);
+												 @Param("inviteSource") String inviteSource);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserInvitationServiceImpl.java

@@ -34,6 +34,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import java.util.Arrays;
 import java.util.Date;
@@ -106,10 +107,10 @@ public class UserInvitationServiceImpl extends BaseServiceImpl<UserInvitationDao
 
     @Override
     public Result saveUserInvitation(UserInvitationFormDTO formDTO) {
-        UserInvitationDTO userInvitationDTO = baseDao.selectUserInvitation(formDTO.getInviteeUserId(),
+        List<UserInvitationDTO> userInvitationDTOList = baseDao.selectUserInvitation(formDTO.getInviteeUserId(),
                 formDTO.getInviteSourceId(),
                 formDTO.getInviteSource());
-        if (null == userInvitationDTO) {
+        if (CollectionUtils.isEmpty(userInvitationDTOList)) {
             UserInvitationDTO insertUserInvitationDTO = new UserInvitationDTO();
             insertUserInvitationDTO.setCustomerId(formDTO.getCustomerId());
             insertUserInvitationDTO.setGridId(formDTO.getGridId());
@@ -120,8 +121,10 @@ public class UserInvitationServiceImpl extends BaseServiceImpl<UserInvitationDao
             insertUserInvitationDTO.setInviteSourceId(formDTO.getInviteSourceId());
             this.save(insertUserInvitationDTO);
         } else {
-            userInvitationDTO.setInvitationTime(new Date());
+            userInvitationDTOList.forEach(userInvitationDTO->{
-            this.update(userInvitationDTO);
+                userInvitationDTO.setInvitationTime(new Date());
+                this.update(userInvitationDTO);
+            });
         }
         return new Result();
     }

epmet-user/epmet-user-server/src/main/resources/mapper/StaffPatrolRecordDao.xml

@@ -7,7 +7,6 @@
     <select id="selectLL" resultType="com.epmet.dto.result.GridManagerUserListResultDTO">
         SELECT t.* FROM
             (SELECT
-                distinct(pr.ID) AS ID,
                 pr.GRID AS gridId,
                 pr.STAFF_ID,
                 pr.`STATUS`,
@@ -15,7 +14,7 @@
                 pd.LONGITUDE,
                 pd.SERIAL_NUM
             FROM staff_patrol_record pr
-            LEFT JOIN staff_patrol_detail pd ON pd.STAFF_PATROL_REC_ID = pr.ID AND pd.DEL_FLAG = 0
+            INNER JOIN (SELECT MAX(pd.CREATED_TIME) , pd.STAFF_PATROL_REC_ID, pd.LATITUDE, pd.LONGITUDE,pd.SERIAL_NUM FROM staff_patrol_detail pd WHERE pd.DEL_FLAG = '0' GROUP BY pd.STAFF_PATROL_REC_ID) pd ON(pd.STAFF_PATROL_REC_ID = pr.ID)
             WHERE pr.DEL_FLAG = 0
                 AND (
                 <foreach collection="userIds" item="userId" separator=" OR ">