陆运修改

Signed-off-by: sunhz <mpcoo@foxmail.com>

blade-common/src/main/java/org/springblade/common/utils/CreateFileUtil.java

@@ -43,7 +43,7 @@ public class CreateFileUtil {
 			}
 
 			// 格式化json字符串
-			jsonString = JsonFormatTool.formatJson(jsonString);
+			// jsonString = JsonFormatTool.formatJson(jsonString);
 
 			// 将格式化后的字符串写入文件
 			Writer write = new OutputStreamWriter(new FileOutputStream(file), "UTF-8");

blade-service-api/blade-land-api/src/main/java/org/springblade/land/constant/LandConst.java

@@ -23,7 +23,7 @@ public interface LandConst {
 
 	String LAND_ORDER_FEE = "LAND_ORDER_FEE";
 
-	String ROLE_ADMIN = "管理员";
+	String ROLE_ADMIN = "admin";
 
 	String ROLE_KH = "客户";
 

blade-service/blade-client/src/main/java/org/springblade/client/corps/service/impl/CorpsAttnServiceImpl.java

@@ -73,9 +73,9 @@ public class CorpsAttnServiceImpl extends ServiceImpl<CorpsAttnMapper, CorpsAttn
 		user.setRealName(attn.getCname());
 		user.setUserType(1);
 		user.setPhone(attn.getTel());
-		user.setRoleId(attn.getRoleId());
-		user.setDeptId(attn.getDeptId());
-		user.setPostId(attn.getPostId());
+		user.setRoleId(corpsAttn.getRoleId());
+		user.setDeptId(corpsAttn.getDeptId());
+		user.setPostId(corpsAttn.getPostId());
 
 		if (ObjectUtil.isNotEmpty(attn.getUserId())) {
 			user.setId(attn.getUserId());

blade-service/blade-land/src/main/java/org/springblade/land/service/impl/TrackLogServiceImpl.java

@@ -146,9 +146,9 @@ public class TrackLogServiceImpl extends ServiceImpl<TrackLogMapper, TrackLog> i
 
 				Map<String, Object> tempMap = new HashMap<>();
 				tempMap.put("location", tempList);
-				tempMap.put("bte", temp.getString("parkAdr"));
-				tempMap.put("ete", temp.getString("parkBte"));
-				tempMap.put("address", temp.getString("parkEte"));
+				tempMap.put("address", temp.getString("parkAdr"));
+				tempMap.put("bte", temp.getString("parkBte"));
+				tempMap.put("ete", temp.getString("parkEte"));
 				tempMap.put("duration", temp.getString("parkMins"));
 				parkArray.add(tempMap);
 			}