|
@@ -1521,13 +1521,13 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
|
|
|
//检查地点
|
|
|
String inspectionLocation = null;
|
|
|
if(ObjectUtil.isEmpty(oldInside.getInspectionlocation())) {
|
|
|
- if(ObjectUtil.isNotNull(updatecolumns.get("INSPECTIONLOCATION"))) {
|
|
|
+ if(ObjectUtil.isNotNull(updatecolumns.get("INSPECTIONLOCATION")) && !"".equals(updatecolumns.get("INSPECTIONLOCATION"))) {
|
|
|
inspectionLocation = StrUtil.concat(true, "检查地点"
|
|
|
, " 变更为:", updatecolumns.get("INSPECTIONLOCATION").toString());
|
|
|
|
|
|
}
|
|
|
} else {
|
|
|
- if(!oldInside.getInspectionlocation().equals(StringUtils.toString(updatecolumns.get("INSPECTIONLOCATION"), null))) {
|
|
|
+ if(!oldInside.getInspectionlocation().equals(StringUtils.toString(updatecolumns.get("INSPECTIONLOCATION"), ""))) {
|
|
|
inspectionLocation = StrUtil.concat(true, "检查地点:", oldInside.getInspectionlocation()
|
|
|
, " 变更为:", updatecolumns.get("INSPECTIONLOCATION").toString());
|
|
|
}
|