diff --git a/src/main/java/org/springblade/modules/business/controller/ApmConfigController.java b/src/main/java/org/springblade/modules/business/controller/ApmConfigController.java index fed03c3..897cffb 100644 --- a/src/main/java/org/springblade/modules/business/controller/ApmConfigController.java +++ b/src/main/java/org/springblade/modules/business/controller/ApmConfigController.java @@ -145,6 +145,13 @@ public class ApmConfigController extends BladeController { List dayList = (List) request.get("dayList"); List configListVOS = (List) request.get("configListVOS"); + if (Func.isEmpty(dayList)) { + return R.fail("放号天为空, 请选择要放号的天"); + } + if (Func.isEmpty(configListVOS)) { + return R.fail("放号配置为空, 请先进行放号配置"); + } + List vos = new ArrayList<>(); configListVOS.forEach(vo -> { vos.add(BeanUtil.copy(vo, ApmConfigListVO.class)); diff --git a/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java b/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java index 9b65429..fe8a147 100644 --- a/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java +++ b/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java @@ -66,7 +66,7 @@ public class OssEndpoint { // 由于部署到服务器会被上传可执行文件, 故此处添加图片格式限制 png, jpeg String suffix = StringUtils.substringAfterLast(file.getOriginalFilename(), "."); - if (!"png".equals(suffix) && !"jpeg".equals(suffix)) { + if (!"png".equals(suffix) && !"jpeg".equals(suffix) && !"jpg".equals(suffix)) { return R.fail("上传失败, 文件格式错误!"); } diff --git a/src/main/java/org/springblade/modules/system/controller/DeptHospitalController.java b/src/main/java/org/springblade/modules/system/controller/DeptHospitalController.java index 22fc31b..edeb489 100644 --- a/src/main/java/org/springblade/modules/system/controller/DeptHospitalController.java +++ b/src/main/java/org/springblade/modules/system/controller/DeptHospitalController.java @@ -73,7 +73,9 @@ public class DeptHospitalController extends BladeController { @ApiOperationSupport(order = 9) @ApiOperation(value = "列表-医院", notes = "列表-医院") public R> listHospital() { - List list = deptService.list(Wrappers.lambdaQuery().eq(Dept::getDeptCategory, BusinessConstant.DEPT_CATEGORY_HOSPITAL)); + List list = deptService.list(Wrappers.lambdaQuery() + .eq(Dept::getDeptCategory, BusinessConstant.DEPT_CATEGORY_HOSPITAL) + .orderByAsc(Dept::getSort)); return R.data(DeptWrapper.build().listNodeVO(list)); }