Merge remote-tracking branch 'origin/master'

3 years ago · ce35667b2b
parent f4d1f3e31f dfb226d480
commit ce35667b2b
1 changed files with 7 additions and 1 deletions
--- a/ruoyi-system/src/main/java/com/ruoyi/system/controller/BaseQiController.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/BaseQiController.java
@ -86,7 +86,13 @@ public class BaseQiController extends BaseController
    @ResponseBody
    public AjaxResult addSave(BaseQi baseQi)
    {
-        return toAjax(baseQiService.insertBaseQi(baseQi));
+
+        List<BaseQi> list = baseQiService.selectBaseQiList(baseQi);
+
+        if (list==null||list.isEmpty()){
+            return toAjax(baseQiService.insertBaseQi(baseQi));
+        }
+        return error("本年数据已经维护");
    }

    /**