diff --git a/src/main/java/com/zcloud/controller/system/ImgFilesController.java b/src/main/java/com/zcloud/controller/system/ImgFilesController.java index a7360af..c886d1f 100644 --- a/src/main/java/com/zcloud/controller/system/ImgFilesController.java +++ b/src/main/java/com/zcloud/controller/system/ImgFilesController.java @@ -62,7 +62,7 @@ public class ImgFilesController extends BaseController { // 保存文件 File tempFile = new File(file.getOriginalFilename()); FileUtils.copyInputStreamToFile(file.getInputStream(), tempFile); - if(!FileUpload.isImage(tempFile) && !TYPE.equals("2") && !TYPE.equals("3")) {//四色图改为json文件,不用判断类型 + if(!FileUpload.isImage(tempFile) && !TYPE.equals("2") && !TYPE.equals("3") && !TYPE.equals("129")) {//四色图改为json文件,不用判断类型 map.put("result", "failed"); map.put("exception", "上传图片格式不正确,请重新上传"); return map; diff --git a/src/main/resources/mybatis/datasource/inspectAnnually/InspectAnnuallyMapper.xml b/src/main/resources/mybatis/datasource/inspectAnnually/InspectAnnuallyMapper.xml index 5a5d0d2..9fdc2a5 100644 --- a/src/main/resources/mybatis/datasource/inspectAnnually/InspectAnnuallyMapper.xml +++ b/src/main/resources/mybatis/datasource/inspectAnnually/InspectAnnuallyMapper.xml @@ -207,7 +207,7 @@ CREATTIME and f.REMINDER_STATUS = #{pd.REMINDER_STATUS} - and case when f.DUE_DATE < NOW() then 1 else 0 end = #{pd.DUE_DATE_TYPE} + and case when f.DUE_DATE < NOW() then 0 else 1 end = #{pd.DUE_DATE_TYPE} ORDER BY f.CREATTIME DESC