|
|
@@ -144,17 +144,28 @@ public class BusinessProjectServiceImpl extends BaseMybatisDao<BusinessProjectMa
|
|
|
return bpo;
|
|
|
}
|
|
|
@Override
|
|
|
- public List<Map<String, String>> getAllCname() {
|
|
|
+ public List<Map<String, String>> getAllCnames(Integer flag) {
|
|
|
List<Map<String, String>> list=new ArrayList<Map<String, String>>();
|
|
|
List<String> listcid=businessVarietiesMapper.getListId();
|
|
|
+
|
|
|
for (String s : listcid) {
|
|
|
Map<String, String> map=new HashMap<>();
|
|
|
String cname=getAllCname(s);
|
|
|
map.put("id", s);
|
|
|
map.put("cname", cname);
|
|
|
- if (StringUtils.isNotBlank(cname)) {
|
|
|
+ if (flag==1) {
|
|
|
+ if (StringUtils.isBlank(cname)) {
|
|
|
+ map.put("cname", "平台超级业务品类");
|
|
|
+ }
|
|
|
list.add(map);
|
|
|
+ }else {
|
|
|
+ if (StringUtils.isNotBlank(cname)) {
|
|
|
+ list.add(map);
|
|
|
+ }
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
return list;
|
|
|
}
|
|
|
@@ -197,9 +208,12 @@ public class BusinessProjectServiceImpl extends BaseMybatisDao<BusinessProjectMa
|
|
|
}
|
|
|
if (StringUtils.isNotBlank(s.getProvince())) {
|
|
|
bp.setProvince(s.getProvince());
|
|
|
+ bp.setCity(s.getCity());
|
|
|
+ bp.setDistrict(s.getDistrict());
|
|
|
}
|
|
|
if (StringUtils.isNotBlank(s.getCity())) {
|
|
|
bp.setCity(s.getCity());
|
|
|
+ bp.setDistrict(s.getDistrict());
|
|
|
}
|
|
|
if (StringUtils.isNotBlank(s.getDistrict())) {
|
|
|
bp.setDistrict(s.getDistrict());
|