FIX merge

zhongzheng-api/src/main/java/com/zhongzheng/controller/cmmon/CommonController.java

@@ -100,8 +100,8 @@ public class CommonController extends BaseController {
         Map<String,Object> map = new HashMap<>();
         map.put("hide",false);
         if(Validator.isNotEmpty(bo.getVersion())){
-            if(bo.getVersion().equals("5.2.5")){
-                map.put("hide",false);
+            if(bo.getVersion().equals("5.2.6")){
+                map.put("hide",true);
             }
         }
         return AjaxResult.success(map);

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/impl/QuestionServiceImpl.java

@@ -895,6 +895,9 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
         String buffer = "";
         String importNo = ServletUtils.getEncoded("IMPORT");
         Long sort = 1L;
+        if(Validator.isEmpty(file)){
+            throw new CustomException("请选择文件");
+        }
         try {
             Long nowTime = DateUtils.getNowTime();
             String path = file.getOriginalFilename();
@@ -1273,6 +1276,9 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
         String buffer = "";
         String importNo = ServletUtils.getEncoded("IMPORT");
         Long sort = 1L;
+        if(Validator.isEmpty(file)){
+            throw new CustomException("请选择文件");
+        }
         try {
             Long nowTime = DateUtils.getNowTime();
             String path = file.getOriginalFilename();