Merge remote-tracking branch 'origin/develop' into develop

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -3793,7 +3793,8 @@ export default {
       } else {
         this.sarStandardsSearch.page = page
       }
-      this.getDomesticStandardTable(this.tableFlag)
+      this.standCommonlySearch.page=page
+      this.getDomesticStandardTable(this.standCommonlySearch)
     },
     // 分页每页显示数改变后方法
     pageSizeChange(pageSize) {
@@ -5087,16 +5088,19 @@ export default {
     },
     choiceZRBM(type, title, id) {
 
+
       this.nodeListZRBM = []
       this.nodeListZRBM.push(id)
       this.drawerTitle = title
       this.modalshowflagZRBM = true
     },
     drawerCheckZRBM(data) {
+
+      console.log("data",data);
       let idList = ''
       let nameList = ''
       data.forEach(item => {
-        if (item.hasChild === '0' && item.children === null) {
+        if (item.hasChild === '0') {
           if (nameList.length > 0) {
             nameList += ','
             idList += ','