|
@@ -478,7 +478,7 @@ public class BaseCameraManagementController extends BaseController {
|
|
}
|
|
}
|
|
String mils = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
|
|
String mils = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
|
|
baseCameraManagement.setInstalls(mils);
|
|
baseCameraManagement.setInstalls(mils);
|
|
- if (!ObjectUtils.isEmpty(baseCameraManagement.getEndMile())&&!ObjectUtils.isEmpty(baseCameraManagement.getBeginMile())) {
|
|
|
|
|
|
+ if (!ObjectUtils.isEmpty(baseCameraManagement.getEndMile()) && !ObjectUtils.isEmpty(baseCameraManagement.getBeginMile())) {
|
|
String en = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
|
|
String en = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
|
|
String beg = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
|
|
String beg = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
|
|
baseCameraManagement.setBeginString(beg);
|
|
baseCameraManagement.setBeginString(beg);
|
|
@@ -761,7 +761,7 @@ public class BaseCameraManagementController extends BaseController {
|
|
children.sort(new Comparator<CameraTree>() {
|
|
children.sort(new Comparator<CameraTree>() {
|
|
@Override
|
|
@Override
|
|
public int compare(CameraTree o1, CameraTree o2) {
|
|
public int compare(CameraTree o1, CameraTree o2) {
|
|
- if (ObjectUtils.isEmpty(o1.getNumber())&& ObjectUtils.isEmpty(o2.getNumber())) {
|
|
|
|
|
|
+ if (!ObjectUtils.isEmpty(o1.getNumber())&& !ObjectUtils.isEmpty(o2.getNumber())) {
|
|
int mileageDiff = o1.getNumber() - o2.getNumber();
|
|
int mileageDiff = o1.getNumber() - o2.getNumber();
|
|
if (mileageDiff == 0) {
|
|
if (mileageDiff == 0) {
|
|
String name1 = ChineseToPingyin.convertHanziToPinyin(o1.getRailwayName());
|
|
String name1 = ChineseToPingyin.convertHanziToPinyin(o1.getRailwayName());
|