update
This commit is contained in:
+8
-1
@@ -157,7 +157,7 @@ public class LawsComplianceBoardServiceImpl implements ILawsComplianceBoardServi
|
|||||||
String textByValue = DesignComplianceStatusEnum.getTextByValue(complianceResult.get("designStatus").toString(), cut);
|
String textByValue = DesignComplianceStatusEnum.getTextByValue(complianceResult.get("designStatus").toString(), cut);
|
||||||
complianceResult.put("designStatus_dicText",textByValue);
|
complianceResult.put("designStatus_dicText",textByValue);
|
||||||
}
|
}
|
||||||
if (complianceResult.get("prehomoStatus") != null) {
|
if (complianceResult.get("prehomoStatus") != null && complianceResult.get("prehomoStatus") != "") {
|
||||||
String textByValue = DesignComplianceStatusEnum.getTextByValue(complianceResult.get("prehomoStatus").toString(), cut);
|
String textByValue = DesignComplianceStatusEnum.getTextByValue(complianceResult.get("prehomoStatus").toString(), cut);
|
||||||
complianceResult.put("prehomoStatus_dicText",textByValue);
|
complianceResult.put("prehomoStatus_dicText",textByValue);
|
||||||
}
|
}
|
||||||
@@ -192,6 +192,13 @@ public class LawsComplianceBoardServiceImpl implements ILawsComplianceBoardServi
|
|||||||
}
|
}
|
||||||
complianceResult.put("dutyTerritory_dicText",dutyTerritory_dicText);
|
complianceResult.put("dutyTerritory_dicText",dutyTerritory_dicText);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Map<String,Object> dataMap = (Map<String, Object>) complianceResult;
|
||||||
|
dataMap.entrySet().forEach(map -> {
|
||||||
|
if(map.getValue() == null){
|
||||||
|
map.setValue("");
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user