fix:修改游记创建人丢失

application-webadmin/src/main/java/com/tourism/webadmin/app/website/service/impl/BasicToWebServiceImpl.java

@@ -27,6 +27,7 @@ import com.tourism.webadmin.back.service.*;
 import com.tourism.webadmin.back.service.impl.TourUserServiceImpl;
 import com.tourism.webadmin.back.vo.*;
 import com.tourism.common.additional.config.ApplicationConfig;
+import com.tourism.webadmin.enums.Constant;
 import com.tourism.webadmin.enums.MyAttentionStatus;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -270,8 +271,10 @@ public class BasicToWebServiceImpl implements BasicToWebService
 
         //填充创建人和头像
         Set<Long> collect = dataList.stream().map(BaseVo::getCreateUserId).collect(Collectors.toSet());
-
+        collect.add(Constant.BASE_TEST_USER_ID);
+        collect.add(Constant.BASE_FORMALLY_USER_ID);
         List<TourUser> inList = tourUserService.getInList(collect);
+
         HashMap<String, TourUser> userHashMap = new HashMap<>();
         for (TourUser tourUser : inList) {
             userHashMap.put(tourUser.getUserId().toString(),tourUser);
@@ -281,6 +284,14 @@ public class BasicToWebServiceImpl implements BasicToWebService
             if(tourUser!=null){
                 vo.setCreateImage(tourUser.getHeadImageUrl());
                 vo.setCreateName(tourUser.getShowName());
+            }else {
+                TourUser tourUser1 = userHashMap.get(Constant.BASE_TEST_USER_ID.toString());
+                if(tourUser1==null){
+                    tourUser1=userHashMap.get(Constant.BASE_FORMALLY_USER_ID.toString());
+                }
+                vo.setCreateImage(tourUser1.getHeadImageUrl());
+                vo.setCreateName(tourUser1.getShowName());
+                vo.setCreateUser(tourUser1.getUserId().toString());
             }
         }
         return pageData;
@@ -371,6 +382,17 @@ public class BasicToWebServiceImpl implements BasicToWebService
             if(creatUser!=null){
                 writeVo.setCreateImage(creatUser.getHeadImageUrl());
                 writeVo.setCreateName(creatUser.getShowName());
+                writeVo.setCreateUser(creatUser.getUserId().toString());
+            }else {
+                TourUser user = tourUserService.getById(Constant.BASE_TEST_USER_ID);
+                if(user==null){
+                    user = tourUserService.getById(Constant.BASE_FORMALLY_USER_ID);
+
+                }
+                writeVo.setCreateImage(user.getHeadImageUrl());
+                writeVo.setCreateName(user.getShowName());
+                writeVo.setCreateUser(user.getUserId().toString());
+
             }
             if(TokenData.takeFromRequest()!=null){
                 Long l = tourGroupController.attentionStatus(writeVo.getCreateUserId());

application-webadmin/src/main/java/com/tourism/webadmin/enums/Constant.java

@@ -0,0 +1,9 @@
+package com.tourism.webadmin.enums;
+
+public class Constant {
+    /**正式服系统默认账号ID 当游记创建人不存在时候游记创建人转移到这个账号下边*/
+    public static final Long BASE_TEST_USER_ID = 1854045864037715968L;
+
+    /**测试服系统默认账号ID 当游记创建人不存在时候游记创建人转移到这个账号下边*/
+    public static final Long BASE_FORMALLY_USER_ID = 1893964919351545856L;
+}