|
@@ -82,15 +82,17 @@ public class GyDataServiceImpl implements GyDataService {
|
|
|
if(StringUtils.isEmpty(province)){
|
|
|
province = sysProvince;
|
|
|
}
|
|
|
- map.put("unitProvince", province);
|
|
|
+ if(!ObjectUtils.isEmpty(province)) {
|
|
|
+ map.put("unitProvince", province);
|
|
|
+ }
|
|
|
|
|
|
String city = currUser.getCity();
|
|
|
if(StringUtils.isEmpty(city)){
|
|
|
city = sysCity;
|
|
|
}
|
|
|
- map.put("unitCity", city);
|
|
|
|
|
|
if(!ObjectUtils.isEmpty(city)){
|
|
|
+ map.put("unitCity", city);
|
|
|
map.put("auditStage", "1");
|
|
|
} else {
|
|
|
map.put("auditStage", "2");
|
|
@@ -112,15 +114,17 @@ public class GyDataServiceImpl implements GyDataService {
|
|
|
if(StringUtils.isEmpty(province)){
|
|
|
province = sysProvince;
|
|
|
}
|
|
|
- map.put("unitProvince", province);
|
|
|
+ if(!ObjectUtils.isEmpty(province)) {
|
|
|
+ map.put("unitProvince", province);
|
|
|
+ }
|
|
|
|
|
|
String city = currUser.getCity();
|
|
|
if(StringUtils.isEmpty(city)){
|
|
|
city = sysCity;
|
|
|
}
|
|
|
- map.put("unitCity", city);
|
|
|
|
|
|
if(!ObjectUtils.isEmpty(city)){
|
|
|
+ map.put("unitCity", city);
|
|
|
map.put("auditStage", "1");
|
|
|
} else {
|
|
|
map.put("auditStage", "2");
|
|
@@ -619,15 +623,18 @@ public class GyDataServiceImpl implements GyDataService {
|
|
|
if(StringUtils.isEmpty(province)){
|
|
|
province = sysProvince;
|
|
|
}
|
|
|
- map.put("unitProvince", province);
|
|
|
+ if(!ObjectUtils.isEmpty(province)) {
|
|
|
+ map.put("unitProvince", province);
|
|
|
+ }
|
|
|
|
|
|
String city = currUser.getCity();
|
|
|
if(StringUtils.isEmpty(city)){
|
|
|
city = sysCity;
|
|
|
}
|
|
|
- map.put("unitCity", city);
|
|
|
+
|
|
|
|
|
|
if(!ObjectUtils.isEmpty(city)){
|
|
|
+ map.put("unitCity", city);
|
|
|
map.put("auditStage", "1");
|
|
|
} else {
|
|
|
map.put("auditStage", "2");
|
|
@@ -647,15 +654,17 @@ public class GyDataServiceImpl implements GyDataService {
|
|
|
if(StringUtils.isEmpty(province)){
|
|
|
province = sysProvince;
|
|
|
}
|
|
|
- map.put("unitProvince", province);
|
|
|
+ if(!ObjectUtils.isEmpty(province)) {
|
|
|
+ map.put("unitProvince", province);
|
|
|
+ }
|
|
|
|
|
|
String city = currUser.getCity();
|
|
|
if(StringUtils.isEmpty(city)){
|
|
|
city = sysCity;
|
|
|
}
|
|
|
- map.put("unitCity", city);
|
|
|
|
|
|
if(!ObjectUtils.isEmpty(city)){
|
|
|
+ map.put("unitCity", city);
|
|
|
map.put("auditStage", "1");
|
|
|
} else {
|
|
|
map.put("auditStage", "2");
|