Merge remote-tracking branch 'origin/develop_1' into develop_master

adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java

@@ -55,6 +55,10 @@ public class WebMvcConfig implements WebMvcConfigurer {
 
     //标准征求意见导出
     addInterceptor.excludePathPatterns("/api/slrs/sar-public-idea-all/tuallStand");
+    //标准法规清单导出
+    addInterceptor.excludePathPatterns("/api/sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById");
+    //标准法规清单车型导出
+    addInterceptor.excludePathPatterns("/api/sarStandProjectLibrary/exportStandAttrInfoExcel");
     //为符合项整改导出
     addInterceptor.excludePathPatterns("/api/sarStandUnqualified/sar-stand-unqualified/exportStandUnqulifiedExcel");
     //文件预览

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java

@@ -208,8 +208,12 @@ public class SarLawsAttrDetailedListController extends BaseController<SarLawsAtt
                             }
                         }
                     }
-                    String completedString = builder.delete(builder.length()-1,builder.length()).toString();
-                    list1.setZRBM(completedString);
+                    try {
+                        String completedString = builder.delete(builder.length()-1,builder.length()).toString();
+                        list1.setZRBM(completedString);
+                    }catch (Exception e){
+                        System.out.println(e);
+                    }
                 }else {
                     for (Map<String, String> map1 : zrbn) {
                         if (map1.get("value").equals(list1.getZRBM())) {