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

project-order/src/main/java/com/alibaba/cloud/integration/order/entity/EngineerInfo.java

@@ -2,12 +2,14 @@ package com.alibaba.cloud.integration.order.entity;
 
 
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import lombok.Data;
 import lombok.Data;
 
 
 import java.sql.Timestamp;
 import java.sql.Timestamp;
 
 
 @Data
 @Data
+@TableName(autoResultMap = true)
 public class EngineerInfo {
 public class EngineerInfo {
 	private Integer id;
 	private Integer id;
 	private String engineerCode;
 	private String engineerCode;

project-order/src/main/java/com/alibaba/cloud/integration/order/service/impl/EngineerServiceImpl.java

@@ -7,6 +7,7 @@ import com.alibaba.cloud.integration.order.dto.EngineerInfoListResp;
 import com.alibaba.cloud.integration.order.dto.EngineerSkillListResp;
 import com.alibaba.cloud.integration.order.dto.EngineerSkillListResp;
 import com.alibaba.cloud.integration.order.entity.*;
 import com.alibaba.cloud.integration.order.entity.*;
 import com.alibaba.cloud.integration.order.service.EngineerService;
 import com.alibaba.cloud.integration.order.service.EngineerService;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -385,10 +386,9 @@ public class EngineerServiceImpl implements EngineerService {
 
 
 			// 标签
 			// 标签
 			List<String> tags = new ArrayList<>();
 			List<String> tags = new ArrayList<>();
-			logger.debug("XXXTENTACION: {}", e.getTags());
-			if (!e.getTags().isEmpty()) {
-				for(Map.Entry<String, Object> entry: e.getTags().entrySet()){
-					tags.add(String.format("%s+%d", entry.getKey(), entry.getValue()));
+			if (e.getTags() != null && e.getTags().isEmpty()) {
+				for(JSONObject.Entry<String, Object> entry: e.getTags().entrySet()){
+					tags.add(String.format("%s+%s", entry.getKey(), entry.getValue().toString()));
 				}
 				}
 			} else {
 			} else {
 				item.setTags(tags);
 				item.setTags(tags);