Commit 8cab1e4e authored by litengwei's avatar litengwei

修改区域规则code

parent a13fc37d
...@@ -108,9 +108,6 @@ public class ProjectServiceImpl extends BaseService<ProjectDto, Project, Project ...@@ -108,9 +108,6 @@ public class ProjectServiceImpl extends BaseService<ProjectDto, Project, Project
static final String status = "status"; static final String status = "status";
public ProjectDto saveProjectInfo(ProjectDto model,String submitType){ public ProjectDto saveProjectInfo(ProjectDto model,String submitType){
String installRegionCode = model.getInstallRegionCode();
String[] split = installRegionCode.split("#");
model.setInstallRegionCode(split[split.length-1]);
String regionName = "",regionCode = ""; String regionName = "",regionCode = "";
Map<String,String> map = getInfo(regionName,regionCode,Long.valueOf(model.getInstallRegionCode())); Map<String,String> map = getInfo(regionName,regionCode,Long.valueOf(model.getInstallRegionCode()));
model.setSubmitDate(new Date()); model.setSubmitDate(new Date());
...@@ -256,9 +253,10 @@ public class ProjectServiceImpl extends BaseService<ProjectDto, Project, Project ...@@ -256,9 +253,10 @@ public class ProjectServiceImpl extends BaseService<ProjectDto, Project, Project
regionName = region.getRegionName() + regionName; regionName = region.getRegionName() + regionName;
if(ValidationUtil.isEmpty(regionCode)){ if(ValidationUtil.isEmpty(regionCode)){
regionCode = String.valueOf(region.getRegionCode()); regionCode = String.valueOf(region.getRegionCode());
} else {
} /*else {
regionCode = region.getRegionCode() +"#" +regionCode; regionCode = region.getRegionCode() +"#" +regionCode;
} }*/
Map<String,String> map = new HashMap(); Map<String,String> map = new HashMap();
if(region.getParentId() != 0L){ if(region.getParentId() != 0L){
map = getInfo(regionName,regionCode,region.getParentId()); map = getInfo(regionName,regionCode,region.getParentId());
......
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