Commit c0c3ef08 authored by 麻笑宇's avatar 麻笑宇

修改气瓶大屏bug

parent 937c2624
...@@ -691,6 +691,7 @@ public class CylinderAreaDataServiceImpl extends BaseService<CylinderAreaDataDto ...@@ -691,6 +691,7 @@ public class CylinderAreaDataServiceImpl extends BaseService<CylinderAreaDataDto
String value = this.getLicenseEfficiencyByRegion(orgCode); String value = this.getLicenseEfficiencyByRegion(orgCode);
if (NO_DATA_STR.equals(value)) { if (NO_DATA_STR.equals(value)) {
value = "0"; value = "0";
xuke.add(value);
} else { } else {
xuke.add(value); xuke.add(value);
} }
......
...@@ -7,6 +7,7 @@ import com.yeejoin.amos.boot.module.cylinder.flc.api.service.ICylinderTagsDataUn ...@@ -7,6 +7,7 @@ import com.yeejoin.amos.boot.module.cylinder.flc.api.service.ICylinderTagsDataUn
import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.CylinderTagsDataUnitDto; import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.CylinderTagsDataUnitDto;
import com.yeejoin.amos.feign.privilege.Privilege; import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.privilege.model.CompanyModel; import com.yeejoin.amos.feign.privilege.model.CompanyModel;
import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import org.typroject.tyboot.core.rdbms.service.BaseService; import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -58,7 +59,7 @@ public class CylinderTagsDataUnitServiceImpl extends BaseService<CylinderTagsDat ...@@ -58,7 +59,7 @@ public class CylinderTagsDataUnitServiceImpl extends BaseService<CylinderTagsDat
for (TagTypeEnums enums : TagTypeEnums.values()) { for (TagTypeEnums enums : TagTypeEnums.values()) {
Map<String, Object> item = new HashMap<>(); Map<String, Object> item = new HashMap<>();
item.put("name", enums.getName()); item.put("name", enums.getName());
item.put("value", stringObjectMap.get(enums.getKey())); item.put("value", CollectionUtils.isEmpty(stringObjectMap)?0:stringObjectMap.get(enums.getKey()));
result.add(item); result.add(item);
} }
return result; return result;
......
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