Merge remote-tracking branch 'origin/thirdStage' into thirdApiStage

laws-base/laws-base-api/jero-system-local-api/src/main/java/com/jero/common/system/api/ISysBaseAPI.java

@@ -350,4 +350,5 @@ public interface ISysBaseAPI extends CommonAPI {
      */
     List<DictModel> loadDictItemByKeyword(String dictCode, String keyword, Integer pageSize);
 
+    String translateByDictMap(Map<String, String> dictMap, String keys);
 }

laws-base/laws-base-core/src/main/java/com/jero/common/api/vo/ResultCommon.java

@@ -6,7 +6,6 @@ package com.jero.common.api.vo;
  * @Description: 返回常量
  */
 public class ResultCommon {
-
     private ResultCommon() {}
 
     /**操作成功*/
@@ -133,6 +132,16 @@ public class ResultCommon {
      */
     public static final String EN_STANDARD_NUMBER_CONFLICT = "en.standard.number.conflict";
 
+    /**
+     * 无效的企标计划
+     */
+    public static final String INVALID_ESP = "invalid.esp";
+
+    /**
+     * 不可以编辑废止或封存状态的企标
+     */
+    public static final String CAN_NOT_EDIT_ABOLISH_OR_ARCHIVE_ES = "can.not.edit.abolish.or.archive.es";
+
 //    ---------项目合规评估流程---------
     /**
      * 模块负责人不能为空

laws-base/laws-base-core/src/main/java/com/jero/config/filter/csrf/CsrfFilter.java

@@ -56,7 +56,7 @@ public class CsrfFilter implements Filter {
         String url = req.getRequestURL().toString();
         // 获取来源
         String referurl = req.getHeader("Referer");
-        if(isWhiteReq(referurl) || Objects.equals(upgrade,"websocket") || url.contains("view")){
+        if(isWhiteReq(referurl) || Objects.equals(upgrade,"websocket") || url.contains("view") || url.contains("doc.html")){
             chain.doFilter(request, response);
         }else{
             String log = "";