修改OTA升级备案-本次升级的系统名称与参数变化按系统名称排序
This commit is contained in:
+12
@@ -19,6 +19,7 @@ import com.jero.modules.ota.utils.ComparisonUtil;
|
||||
import com.jero.modules.ota.utils.ImportFileUtil;
|
||||
import com.jero.modules.project.util.WordUtil;
|
||||
import com.jero.modules.split.common.FileUnZip;
|
||||
import com.jero.modules.system.entity.SysDepart;
|
||||
import com.jero.modules.system.service.ISysDictService;
|
||||
import org.apache.commons.collections4.CollectionUtils;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
@@ -193,6 +194,17 @@ public class OtaBaSjSjxtbhServiceImpl extends ServiceImpl<OtaBaSjSjxtbhMapper, O
|
||||
if (ObjectUtil.isEmpty(res)) {
|
||||
res = getByOtaId(otaIdT);
|
||||
}
|
||||
if (ObjectUtil.isNotEmpty(res)) {
|
||||
Collections.sort(res, (arg0, arg1) -> {
|
||||
if (null == arg0.getXtmc()) {
|
||||
arg0.setXtmc("");
|
||||
}
|
||||
if (null == arg1.getXtmc()) {
|
||||
arg1.setXtmc("");
|
||||
}
|
||||
return arg0.getXtmc().compareTo(arg1.getXtmc());
|
||||
});
|
||||
}
|
||||
JSONObject json = new JSONObject();
|
||||
json.put("list", res);
|
||||
return json;
|
||||
|
||||
Reference in New Issue
Block a user