diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java index 0f425e829..6f08b301e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java @@ -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 { + 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;