Commit c10b1fc0 authored by tangwei's avatar tangwei

修改bug

parent c88f497f
...@@ -688,6 +688,7 @@ public class ExcelServiceImpl { ...@@ -688,6 +688,7 @@ public class ExcelServiceImpl {
if (item.getFireTeam() != null) { if (item.getFireTeam() != null) {
Long fireTeamId = Long.valueOf(item.getFireTeam().split("@")[1]); Long fireTeamId = Long.valueOf(item.getFireTeam().split("@")[1]);
firefighters.setFireTeamId(fireTeamId); firefighters.setFireTeamId(fireTeamId);
firefighters.setFireTeamName(item.getFireTeam().split("@")[0]);
} }
if (firefighters.getCertificatesType() != null) { if (firefighters.getCertificatesType() != null) {
String[] certificates = firefighters.getCertificatesType().split("@"); String[] certificates = firefighters.getCertificatesType().split("@");
...@@ -713,7 +714,7 @@ public class ExcelServiceImpl { ...@@ -713,7 +714,7 @@ public class ExcelServiceImpl {
firefighters.setCompanyName(tempCompany[0]); firefighters.setCompanyName(tempCompany[0]);
firefighters.setCompany(tempCompany[1]); firefighters.setCompany(tempCompany[1]);
firefighters.setBizOrgName(tempCompany[0]); firefighters.setBizOrgName(tempCompany[0]);
firefighters.setBizOrgCode(tempCompany[1]); firefighters.setBizOrgCode(tempCompany[2]);
} }
if (firefighters.getNativePlaceValue() != null) { if (firefighters.getNativePlaceValue() != null) {
String[] tempCity = firefighters.getNativePlaceValue().split("@"); String[] tempCity = firefighters.getNativePlaceValue().split("@");
...@@ -1758,7 +1759,7 @@ public class ExcelServiceImpl { ...@@ -1758,7 +1759,7 @@ public class ExcelServiceImpl {
ReginParams params = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(keyString, token)).toString(), ReginParams params = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(keyString, token)).toString(),
ReginParams.class); ReginParams.class);
userModel.setRecUserId(params.getUserModel().getUserId()); userModel.setRecUserId(params.getUserModel().getUserId());
userModel.setRecUserName(params.getUserModel().getUserName()); userModel.setRecUserName(params.getUserModel().getRealName());
userModel.setRecDate(new Date()); userModel.setRecDate(new Date());
return userModel; return userModel;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment