Merge branch 'wanjing' into develop

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/entity/User.java

@@ -2,9 +2,7 @@ package com.tuoheng.admin.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+import lombok.*;
 import lombok.experimental.Accessors;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -21,6 +19,8 @@ import java.util.Date;
  */
 @Data
 @Builder
+@AllArgsConstructor
+@NoArgsConstructor
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName("th_oauth_user")

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/workorder/query/QueryWorkOrderPageListService.java

@@ -1,6 +1,7 @@
 package com.tuoheng.admin.service.workorder.query;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -181,7 +182,9 @@ public class QueryWorkOrderPageListService {
                 String[] assignUserArr = assignUsers.split(",");
                 for (String au : assignUserArr) {
                     assignUser = assignUserMap.get(au);
-                    assignUserNames += assignUser.getRealname() + ",";
+                    if (ObjectUtil.isNotNull(assignUser)) {
+                        assignUserNames += assignUser.getRealname() + ",";
+                    }
                 }
             }
             if (!StringUtils.isEmpty(assignUserNames)) {