diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/regulations/entity/SearchStandContext.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/regulations/entity/SearchStandContext.java
index 32df4b99..9484cace 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/regulations/entity/SearchStandContext.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/regulations/entity/SearchStandContext.java
@@ -61,5 +61,7 @@ public class SearchStandContext implements Serializable {
 
     private String standCode;
 
+    private String standId;
+
 
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/regulations/entity/StandData.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/regulations/entity/StandData.java
index ad9897ba..228689eb 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/regulations/entity/StandData.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/regulations/entity/StandData.java
@@ -28,4 +28,7 @@ public class StandData {
 
     @ApiModelProperty(value = "标准分类+空格+标准号+空格+标准名称")
     private String documentName;
+
+    @ApiModelProperty(value = "标准分类+空格+标准号+空格+标准名称")
+    private String standNum;
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfo.java
index 47b0f8ae..abe68add 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfo.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfo.java
@@ -61,6 +61,10 @@ public class SarBussStandAttrInfo extends BaseEntity {
     @TableField("BDTQBBHBUSS")
     private String bdtqbbhbuss;
 
+    @ApiModelProperty(value = "被代替企标编号")
+    @TableField("DTQBBHBUSS")
+    private String dtqbbhbuss;
+
     @TableField(exist = false)
     private String glwj;
 //
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java
index 89a0e15b..95df74ad 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java
@@ -951,10 +951,10 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
                 ExportEmptyModel model = map.get(sarStandardsInfo.getId());
                 model.setStandName(sarStandardsInfo.getStandName());
                 model.setStandEnName(sarStandardsInfo.getStandEnName());
-                model.setNylx(null!=sarStandardsInfo.getAttrInfoCaseMap().get("nylx").toString() ?sarStandardsInfo.getAttrInfoCaseMap().get("nylx").toString():"");
-                model.setSycpx(null!=sarStandardsInfo.getAttrInfoCaseMap().get("sycpx").toString() ?sarStandardsInfo.getAttrInfoCaseMap().get("sycpx").toString():"");
-                model.setZrbm(null!=sarStandardsInfo.getAttrInfoCaseMap().get("zrbm").toString() ?sarStandardsInfo.getAttrInfoCaseMap().get("zrbm").toString():"");
-                model.setSycx(null!=sarStandardsInfo.getAttrInfoCaseMap().get("cllx").toString() ?sarStandardsInfo.getAttrInfoCaseMap().get("cllx").toString():"");
+                model.setNylx(null!=sarStandardsInfo.getAttrInfoCaseMap().get("nylx") ?sarStandardsInfo.getAttrInfoCaseMap().get("nylx").toString():"");
+                model.setSycpx(null!=sarStandardsInfo.getAttrInfoCaseMap().get("sycpx") ?sarStandardsInfo.getAttrInfoCaseMap().get("sycpx").toString():"");
+                model.setZrbm(null!=sarStandardsInfo.getAttrInfoCaseMap().get("zrbm") ?sarStandardsInfo.getAttrInfoCaseMap().get("zrbm").toString():"");
+                model.setSycx(null!=sarStandardsInfo.getAttrInfoCaseMap().get("cllx") ?sarStandardsInfo.getAttrInfoCaseMap().get("cllx").toString():"");
                 result.add(model);
             });
         }
@@ -978,10 +978,10 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
                 ExportEmptyModel model = map.get(sarStandardsInfo.getId());
                 model.setStandName(sarStandardsInfo.getStandName());
                 model.setStandEnName(sarStandardsInfo.getStandEnName());
-                model.setNylx(null!=sarStandardsInfo.getAttrInfoCaseMap().get("nylx").toString() ?sarStandardsInfo.getAttrInfoCaseMap().get("nylx").toString():"");
-                model.setSycpx(null!=sarStandardsInfo.getAttrInfoCaseMap().get("sycpx").toString() ?sarStandardsInfo.getAttrInfoCaseMap().get("sycpx").toString():"");
-                model.setZrbm(null!=sarStandardsInfo.getAttrInfoCaseMap().get("zrbm").toString() ?sarStandardsInfo.getAttrInfoCaseMap().get("zrbm").toString():"");
-                model.setSycx(null!=sarStandardsInfo.getAttrInfoCaseMap().get("cllx").toString() ?sarStandardsInfo.getAttrInfoCaseMap().get("cllx").toString():"");
+                model.setNylx(null!=sarStandardsInfo.getAttrInfoCaseMap().get("nylx") ?sarStandardsInfo.getAttrInfoCaseMap().get("nylx").toString():"");
+                model.setSycpx(null!=sarStandardsInfo.getAttrInfoCaseMap().get("sycpx") ?sarStandardsInfo.getAttrInfoCaseMap().get("sycpx").toString():"");
+                model.setZrbm(null!=sarStandardsInfo.getAttrInfoCaseMap().get("zrbm") ?sarStandardsInfo.getAttrInfoCaseMap().get("zrbm").toString():"");
+                model.setSycx(null!=sarStandardsInfo.getAttrInfoCaseMap().get("cllx") ?sarStandardsInfo.getAttrInfoCaseMap().get("cllx").toString():"");
                 result.add(model);
             });
         }
@@ -1004,10 +1004,10 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
                 ExportEmptyModel model = map.get(sarStandardsInfo.getId());
                 model.setStandName(sarStandardsInfo.getLawsName());
                 model.setStandEnName(sarStandardsInfo.getLawsEnName());
-                model.setNylx(null!=sarStandardsInfo.getAttrInfoCaseMap().get("nylxlaws").toString() ?sarStandardsInfo.getAttrInfoCaseMap().get("nylxlaws").toString():"");
+                model.setNylx(null!=sarStandardsInfo.getAttrInfoCaseMap().get("nylxlaws") ?sarStandardsInfo.getAttrInfoCaseMap().get("nylxlaws").toString():"");
                 //没有使用产品线
 //                model.setSycpx(null!=sarStandardsInfo.getLawsSycx() ?sarStandardsInfo.getLawsSycx():"");
-                model.setZrbm(null!=sarStandardsInfo.getAttrInfoCaseMap().get("zrbmlaws").toString() ?sarStandardsInfo.getAttrInfoCaseMap().get("zrbmlaws").toString():"");
+                model.setZrbm(null!=sarStandardsInfo.getAttrInfoCaseMap().get("zrbmlaws") ?sarStandardsInfo.getAttrInfoCaseMap().get("zrbmlaws").toString():"");
                 model.setSycx(null!=sarStandardsInfo.getLawsSycx() ?sarStandardsInfo.getLawsSycx():"");
                 result.add(model);
             });
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java
index 4458e331..146b2b83 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java
@@ -50,7 +50,7 @@ public class SarStandAttrInfo extends BaseEntity {
 
     @ApiModelProperty(value = "修改时间")
     @TableField("MODIFY_TIME")
-    private LocalDateTime modifyTime;
+    private Date modifyTime;
 
     @ApiModelProperty(value = "归口管理部门")
     @TableField("GKDW")
@@ -234,5 +234,9 @@ public class SarStandAttrInfo extends BaseEntity {
     @TableField("TXLB")
     private String txlb;
 
+    @ApiModelProperty(value = "体系类别")
+    @TableField("BDTBZH")
+    private String bdtbzh;
+
 
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
index 75e38532..2fd90784 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
@@ -822,6 +822,21 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
         return "1";
     }
 
+
+    @ApiOperation(value = "国内海外数据处理接口")
+    @GetMapping("/replaceBdtbzhforDtbzh")
+    public String replaceBdtbzhforDtbzh(SarStandardsInfo sarStandardsInfo) {
+        sarStandardsInfoEOService.replaceBdtbzhforDtbzh();
+        return "1";
+    }
+
+    @ApiOperation(value = "企标数据处理接口")
+    @GetMapping("/replaceBdtbzhforDtbzhQb")
+    public String replaceBdtbzhforDtbzhQb(SarStandardsInfo sarStandardsInfo) {
+        sarStandardsInfoEOService.replaceBdtbzhforDtbzhQb();
+        return "1";
+    }
+
     @ApiOperation(value = "|SarStandardsInfoEO|自定义分页查询")
     @GetMapping("/checkIsOnly")
     public ResponseMessage checkIsOnly (SarStandardsInfoEOPage page){
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java
index 62383c9f..e8ee8535 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java
@@ -60,4 +60,8 @@ public interface ISarStandardsInfoService extends IService<SarStandardsInfo> {
     void insertIntoIndexForMap(Map<String,Object> attrInfoMap);
 
     void updateIntoIndexForMap(Map<String,Object> attrInfoMap);
+
+    void replaceBdtbzhforDtbzh();
+
+    void replaceBdtbzhforDtbzhQb();
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
index 375253d1..4dc6e722 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
@@ -3,10 +3,19 @@ package com.adc.da.slrs.sarStandardsInfo.service.impl;
 import com.adc.da.att.entity.AttFileEO;
 import com.adc.da.person.entity.StandInfo;
 import com.adc.da.person.entity.TsPersonCollect;
+import com.adc.da.slrs.regulations.dao.StandDataDao;
+import com.adc.da.slrs.regulations.entity.SearchStandContext;
+import com.adc.da.slrs.regulations.entity.StandData;
+import com.adc.da.slrs.sarBussStandAttrInfo.dao.SarBussStandAttrInfoDao;
+import com.adc.da.slrs.sarBussStandAttrInfo.entity.SarBussStandAttrInfo;
+import com.adc.da.slrs.sarBussStandAttrInfo.service.ISarBussStandAttrInfoService;
+import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand;
+import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService;
 import com.adc.da.slrs.sarLawsAttrDetailedList.dao.SarLawsAttrDetailedListDao;
 import com.adc.da.slrs.sarLawsAttrDetailedList.entity.SarFindDto;
 import com.adc.da.slrs.sarPosition.entity.TsPosition;
 import com.adc.da.slrs.sarPosition.service.ITsPositionService;
+import com.adc.da.slrs.sarStandAttrInfo.service.ISarStandAttrInfoService;
 import com.adc.da.slrs.sarStandWarning.dao.WarningDateDao;
 import com.adc.da.slrs.sarStandWarning.entity.WarningDate;
 import com.adc.da.slrs.sarStandWarning.service.Impl.WarningDateServiceImpl;
@@ -241,6 +250,25 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
 
     @Autowired
     private TsDicTypeDao tsDicTypeDao;
+
+    @Autowired
+    private ISarStandAttrInfoService iSarStandAttrInfoService;
+
+    @Autowired
+    private ISarStandardsInfoService sarStandardsInfoService;
+
+    @Autowired
+    private ISarBussStandAttrInfoService iSarBussStandAttrInfoService;
+
+    @Autowired
+    private ISarBussionessStandService iSarBussionessStandService;
+
+    @Autowired
+    private SarBussStandAttrInfoDao standAttrInfoDao;
+
+
+    @Autowired
+    private StandDataDao standDataDao;
 //    /**
 //     * 反向操作标准
 //     */
@@ -296,6 +324,217 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
 //    }
 
 
+    @Override
+    public void replaceBdtbzhforDtbzh() {
+        //第一步先处理国内海外数据
+        //获取代替标准号不为空的数据
+        QueryWrapper<SarStandAttrInfo> wrapper = new QueryWrapper<>();
+        wrapper.isNotNull("DTBJH");
+        wrapper.ne("DTBJH", "");
+        wrapper.eq("valid_flag", "0");
+        List<SarStandAttrInfo> sarStandAttrInfos = sarStandAttrInfoEODao.selectList(wrapper);
+        if (null != sarStandAttrInfos && !sarStandAttrInfos.isEmpty()) {
+            //获取数据以及更新自身 新查询当前标准数据并将格式化之后的数据更新到代替标准号中
+            int i = 1;
+            for (SarStandAttrInfo sarStandAttrInfo : sarStandAttrInfos) {
+                String dtbzh = convertStandCodeHandle(sarStandAttrInfo.getDtbjh());
+                logger.info("第" + i + "行数据代替标准号为" + dtbzh + "转换前标准号为" + sarStandAttrInfo.getDtbjh());
+                logger.info("第" + i + "行数据为" + sarStandAttrInfo.toString());
+                QueryWrapper<SarStandAttrInfo> wrapper2 = new QueryWrapper<>();
+                wrapper2.eq("valid_flag", "0");
+                wrapper2.eq("stand_id", sarStandAttrInfo.getStandId());
+                List<SarStandAttrInfo> attrInfoList = sarStandAttrInfoEODao.selectList(wrapper2);
+                attrInfoList.get(0).setDtbjh(dtbzh);
+                sarStandAttrInfoEODao.update(attrInfoList.get(0), wrapper2);
+
+
+                //找到用来代替的标准号
+                SearchStandContext searchStandContext1 = new SearchStandContext();
+                searchStandContext1.setStandId(sarStandAttrInfo.getStandId());
+                List<StandData> list1 = standDataDao.searchStandDataThree(searchStandContext1);
+                if (null != list1 && list1.size() > 0) {
+                    String bdtbzh = list1.get(0).getStandNum();
+
+                    //现在针对处理一波代替标准号  根据标准号找到
+                    if (dtbzh.contains(",") && !dtbzh.isEmpty() && !"".equals(dtbzh) && !dtbzh.contains("null") && !dtbzh.contains("Q/FT")) {
+                        //判定是不是多个
+                        List<String> strings = new ArrayList<>(Arrays.asList(dtbzh.split(",")));
+                        strings.forEach(s -> {
+                            if (StringUtils.isNotBlank(s)) {
+                                SearchStandContext searchStandContext = new SearchStandContext();
+                                searchStandContext.setStandCode(s);
+                                List<StandData> list = standDataDao.searchStandDataThree(searchStandContext);
+                                if (null != list && list.size() > 0) {
+                                    QueryWrapper<SarStandAttrInfo> wrapper1 = new QueryWrapper<>();
+                                    wrapper1.eq("valid_flag", "0");
+                                    wrapper1.eq("stand_id", list.get(0).getStandId());
+                                    List<SarStandAttrInfo> attrInfos = sarStandAttrInfoEODao.selectList(wrapper1);
+                                    if (null != attrInfos && attrInfos.size() > 0) {
+                                        if (null != attrInfos.get(0).getBdtbzh() && !"".equals(attrInfos.get(0).getBdtbzh())) {
+                                            if (!attrInfos.get(0).getBdtbzh().contains(bdtbzh)) {
+                                                attrInfos.get(0).setBdtbzh(attrInfos.get(0).getBdtbzh() + "," + bdtbzh);
+                                            }
+                                        } else {
+                                            attrInfos.get(0).setBdtbzh(bdtbzh);
+                                        }
+                                        sarStandAttrInfoEODao.update(attrInfos.get(0), wrapper1);
+                                    }
+                                }
+                            }
+                        });
+
+                    } else if (!dtbzh.isEmpty() && !"".equals(dtbzh) && !dtbzh.contains("null") && !dtbzh.contains("Q/FT")) {
+                        //单个
+                        SearchStandContext searchStandContext = new SearchStandContext();
+                        searchStandContext.setStandCode(dtbzh);
+                        List<StandData> list = standDataDao.searchStandDataThree(searchStandContext);
+                        if (null != list && list.size() > 0) {
+                            QueryWrapper<SarStandAttrInfo> wrapper1 = new QueryWrapper<>();
+                            wrapper1.eq("valid_flag", "0");
+                            wrapper1.eq("stand_id", list.get(0).getStandId());
+                            List<SarStandAttrInfo> attrInfos = sarStandAttrInfoEODao.selectList(wrapper1);
+                            if (null != attrInfos && attrInfos.size() > 0) {
+                                if (null != attrInfos.get(0).getBdtbzh() && !"".equals(attrInfos.get(0).getBdtbzh())) {
+                                    if (!attrInfos.get(0).getBdtbzh().contains(bdtbzh)) {
+                                        attrInfos.get(0).setBdtbzh(attrInfos.get(0).getBdtbzh() + "," + bdtbzh);
+                                    }
+                                } else {
+                                    attrInfos.get(0).setBdtbzh(bdtbzh);
+                                }
+                                sarStandAttrInfoEODao.update(attrInfos.get(0), wrapper1);
+                            }
+                        }
+                    }
+                    i++;
+                }
+            }
+        }
+
+    }
+
+    @Override
+    public void replaceBdtbzhforDtbzhQb() {
+        //第一步先处理国内海外数据
+        //获取代替标准号不为空的数据
+        QueryWrapper<SarBussStandAttrInfo> wrapper = new QueryWrapper<>();
+        wrapper.isNotNull("DTQBBHBUSS");
+        wrapper.ne("DTQBBHBUSS", "");
+        wrapper.eq("valid_flag", "0");
+//        wrapper.eq("STAND_ID","ruxmkyu3d6bgdg7wehkv");
+        List<SarBussStandAttrInfo> sarStandAttrInfos = standAttrInfoDao.selectList(wrapper);
+        if (null != sarStandAttrInfos && !sarStandAttrInfos.isEmpty()) {
+            //获取数据以及更新自身 新查询当前标准数据并将格式化之后的数据更新到代替标准号中
+            int i = 1;
+            for (SarBussStandAttrInfo sarBussStandAttrInfo : sarStandAttrInfos) {
+                String dtbzh = convertStandCodeHandle(sarBussStandAttrInfo.getDtqbbhbuss());
+                logger.info("第" + i + "行数据代替标准号为" + dtbzh + "转换前标准号为" + sarBussStandAttrInfo.getDtqbbhbuss());
+                logger.info("第" + i + "行数据为" + sarBussStandAttrInfo.toString());
+                QueryWrapper<SarBussStandAttrInfo> wrapper2 = new QueryWrapper<>();
+                wrapper2.eq("valid_flag", "0");
+                wrapper2.eq("stand_id", sarBussStandAttrInfo.getStandId());
+                List<SarBussStandAttrInfo> attrInfoList = standAttrInfoDao.selectList(wrapper2);
+                attrInfoList.get(0).setDtqbbhbuss(dtbzh);
+                standAttrInfoDao.update(attrInfoList.get(0), wrapper2);
+
+
+                //找到用来代替的标准号
+                SearchStandContext searchStandContext1 = new SearchStandContext();
+                searchStandContext1.setStandId(sarBussStandAttrInfo.getStandId());
+                List<StandData> list1 = standDataDao.searchStandDataThree(searchStandContext1);
+                if (null != list1 && list1.size() > 0) {
+                    String bdtbzh = list1.get(0).getStandNum();
+
+                    //现在针对处理一波代替标准号  根据标准号找到
+                    if (dtbzh.contains(",") && !dtbzh.isEmpty() && !"".equals(dtbzh) ) {
+                        //判定是不是多个
+                        List<String> strings = new ArrayList<>(Arrays.asList(dtbzh.split(",")));
+                        strings.forEach(s -> {
+                            if (StringUtils.isNotBlank(s)) {
+                                SearchStandContext searchStandContext = new SearchStandContext();
+                                searchStandContext.setStandCode(s);
+                                List<StandData> list = standDataDao.searchStandDataThree(searchStandContext);
+                                if (null != list && list.size() > 0) {
+                                    QueryWrapper<SarBussStandAttrInfo> wrapper1 = new QueryWrapper<>();
+                                    wrapper1.eq("valid_flag", "0");
+                                    wrapper1.eq("stand_id", list.get(0).getStandId());
+                                    List<SarBussStandAttrInfo> attrInfos = standAttrInfoDao.selectList(wrapper1);
+                                    if (null != attrInfos && attrInfos.size() > 0) {
+                                        if (null != attrInfos.get(0).getBdtqbbhbuss() && !"".equals(attrInfos.get(0).getBdtqbbhbuss())) {
+                                            if (!attrInfos.get(0).getBdtqbbhbuss().contains(bdtbzh)) {
+                                                attrInfos.get(0).setBdtqbbhbuss(attrInfos.get(0).getBdtqbbhbuss() + "," + bdtbzh);
+                                            }
+                                        } else {
+                                            attrInfos.get(0).setBdtqbbhbuss(bdtbzh);
+                                        }
+                                        standAttrInfoDao.update(attrInfos.get(0), wrapper1);
+                                    }
+                                }
+                            }
+                        });
+
+                    } else if (!dtbzh.isEmpty() && !"".equals(dtbzh) ) {
+                        //单个
+                        SearchStandContext searchStandContext = new SearchStandContext();
+                        searchStandContext.setStandCode(dtbzh);
+                        List<StandData> list = standDataDao.searchStandDataThree(searchStandContext);
+                        if (null != list && list.size() > 0) {
+                            QueryWrapper<SarBussStandAttrInfo> wrapper1 = new QueryWrapper<>();
+                            wrapper1.eq("valid_flag", "0");
+                            wrapper1.eq("stand_id", list.get(0).getStandId());
+                            List<SarBussStandAttrInfo> attrInfos = standAttrInfoDao.selectList(wrapper1);
+                            if (null != attrInfos && attrInfos.size() > 0) {
+                                if (null != attrInfos.get(0).getBdtqbbhbuss() && !"".equals(attrInfos.get(0).getBdtqbbhbuss())) {
+                                    if (!attrInfos.get(0).getBdtqbbhbuss().contains(bdtbzh)) {
+                                        attrInfos.get(0).setBdtqbbhbuss(attrInfos.get(0).getBdtqbbhbuss() + "," + bdtbzh);
+                                    }
+                                } else {
+                                    attrInfos.get(0).setBdtqbbhbuss(bdtbzh);
+                                }
+                                standAttrInfoDao.update(attrInfos.get(0), wrapper1);
+                            }
+                        }
+                    }
+                    i++;
+                }
+            }
+        }
+
+    }
+
+    private String convertStandCodeHandle(String standCode) {
+        if (StringUtils.isNotBlank(standCode)) {
+            standCode = standCode.replaceAll("—", "-");
+            standCode = standCode.replaceAll(" -", "-");
+            standCode = standCode.replaceAll("－", "-");
+            standCode = standCode.replaceAll(" - ", "-");
+            standCode = standCode.replaceAll("&nbsp;", " ");
+            standCode = standCode.replaceAll("—", "-");
+            standCode = standCode.replaceAll("Q-QCBFC", "Q/QCBFC");
+            standCode = standCode.replaceAll("Q-FT", "Q/FT");
+            standCode = standCode.replaceAll("Q/ FT", "Q/FT");
+            standCode = standCode.replaceAll(" -", "-");
+            standCode = standCode.replaceAll("－", "-");
+            standCode = standCode.replaceAll("Q/QCFLC", "Q/QCFLC");
+            standCode = standCode.replaceAll("  ", " ");
+            standCode = standCode.replaceAll("—", "-");
+            standCode = standCode.replaceAll("（", "(");
+            standCode = standCode.replaceAll("）", ")");
+            standCode = standCode.replaceAll(" -", "-");
+            standCode = standCode.replaceAll("－", "-");
+            standCode = standCode.replaceAll("：", ":");
+            standCode = standCode.replaceAll("Part", "PART");
+            standCode = standCode.replaceAll("，", ",");
+            standCode = standCode.replaceAll("、", ",");
+//            standCode = standCode.replaceAll("--", "");
+//            standCode = standCode.replaceAll("-", "");
+//            standCode = standCode.replaceAll("_", "");
+            if ("--".equals(standCode) || "-".equals(standCode) || "_".equals(standCode)) {
+                standCode = "";
+            }
+        }
+        return standCode;
+    }
+
     /***
      * @Description: 分页查询
      * @Author: super_liu
@@ -306,13 +545,13 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
     @Override
     public List<SarStandardsInfo> getSarStandardsInfoPage(SarStandardsInfoEOPage page) throws Exception {
         //查询当前登录人角色拥有权限的菜单
-        if(page.getMenuId() != null && page.getUserId() != null && StringUtils.isNotBlank(page.getUserId())){
+        if (page.getMenuId() != null && page.getUserId() != null && StringUtils.isNotBlank(page.getUserId())) {
             String treeType = page.getTreeType();
             QueryWrapper qw = new QueryWrapper<>();
-            qw.eq("ID",page.getMenuId());
+            qw.eq("ID", page.getMenuId());
             qw.isNull("PARENT_ID");
             List<TsResource> children = iTsResourceService.list(qw);
-            if(children.isEmpty() && !page.getMenuId().equals("nomenu") && StringUtils.isNotBlank(treeType) && "tsr".equals(treeType)){
+            if (children.isEmpty() && !page.getMenuId().equals("nomenu") && StringUtils.isNotBlank(treeType) && "tsr".equals(treeType)) {
 //                List<String> getMenuIdList = tsUserService.getResourceUserId(page.getUserId());
 //                if (getMenuIdList != null && !getMenuIdList.isEmpty()) {
 //                    page.setMenuRoleList(getMenuIdList);
@@ -323,7 +562,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                 if (ids != null && !ids.isEmpty()) {
                     page.setMenuAllChildrenIdList(ids);
                 }
-            }else if(!page.getMenuId().equals("nomenu") && StringUtils.isNotBlank(treeType) && "sarMs".equals(treeType)){
+            } else if (!page.getMenuId().equals("nomenu") && StringUtils.isNotBlank(treeType) && "sarMs".equals(treeType)) {
 //                List<String> getMenuIdList = tsUserService.getResourceUserId(page.getUserId());
 //                if (getMenuIdList != null && !getMenuIdList.isEmpty()) {
 //                    page.setMenuRoleList(getMenuIdList);
@@ -334,7 +573,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                 if (ids != null && !ids.isEmpty()) {
                     page.setMenuAllChildrenIdList(ids);
                 }
-            }else if(page.getMenuId().equals("nomenu") && StringUtils.isNotBlank(page.getSarMsType()) && "filterSarMsMenu".equals(page.getSarMsType())){
+            } else if (page.getMenuId().equals("nomenu") && StringUtils.isNotBlank(page.getSarMsType()) && "filterSarMsMenu".equals(page.getSarMsType())) {
 //                List<String> getMenuIdList = tsUserService.getResourceUserId(page.getUserId());
 //                if (getMenuIdList != null && !getMenuIdList.isEmpty()) {
 //                    page.setMenuRoleList(getMenuIdList);
@@ -349,7 +588,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         }
         Integer rowCount = dao.getSarStandardsInfoCount(page);
         page.getPager().setRowCount(rowCount);
-        List<SarStandardsInfo> sarlist = dao.getSarStandardsInfoPage(page,"0");
+        List<SarStandardsInfo> sarlist = dao.getSarStandardsInfoPage(page, "0");
         attrInfoCollect(sarlist);
         return sarlist;
     }
@@ -357,12 +596,12 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
     @Override
     public List<SarStandardsInfo> getSarStandardsInfoPageByWk1(SarStandardsInfoEOPage page) throws Exception {
         //查询当前登录人角色拥有权限的菜单
-        if(page.getMenuId() != null && page.getUserId() != null && StringUtils.isNotBlank(page.getUserId())){
+        if (page.getMenuId() != null && page.getUserId() != null && StringUtils.isNotBlank(page.getUserId())) {
             QueryWrapper<TsResource> qw = new QueryWrapper<>();
-            qw.eq("ID",page.getMenuId());
+            qw.eq("ID", page.getMenuId());
             qw.isNull("PARENT_ID");
             List<TsResource> children = iTsResourceService.list(qw);
-            if(children.isEmpty() && !page.getMenuId().equals("nomenu")){
+            if (children.isEmpty() && !page.getMenuId().equals("nomenu")) {
 //                List<String> getMenuIdList = tsUserService.getResourceUserId(page.getUserId());
 //                if (getMenuIdList != null && !getMenuIdList.isEmpty()) {
 //                    page.setMenuRoleList(getMenuIdList);
@@ -377,7 +616,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         }
         Integer rowCount = dao.getSarStandardsInfoCountWk1(page);
         page.getPager().setRowCount(rowCount);
-        List<SarStandardsInfo> sarlist = dao.getSarStandardsInfoPage(page,"996");
+        List<SarStandardsInfo> sarlist = dao.getSarStandardsInfoPage(page, "996");
         attrInfoCollect(sarlist);
         return sarlist;
     }
@@ -385,12 +624,12 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
     @Override
     public List<SarStandardsInfo> getSarStandardsInfoPageBak(SarStandardsInfoEOPage page) throws Exception {
         //查询当前登录人角色拥有权限的菜单
-        if(page.getMenuId() != null && page.getUserId() != null && StringUtils.isNotBlank(page.getUserId())){
+        if (page.getMenuId() != null && page.getUserId() != null && StringUtils.isNotBlank(page.getUserId())) {
             QueryWrapper<TsResource> qw = new QueryWrapper<>();
-            qw.eq("ID",page.getMenuId());
+            qw.eq("ID", page.getMenuId());
             qw.isNull("PARENT_ID");
             List<TsResource> children = iTsResourceService.list(qw);
-            if(children.isEmpty() && !page.getMenuId().equals("nomenu")){
+            if (children.isEmpty() && !page.getMenuId().equals("nomenu")) {
                 List<String> getMenuIdList = tsUserService.getResourceUserId(page.getUserId());
                 if (getMenuIdList != null && !getMenuIdList.isEmpty()) {
                     page.setMenuRoleList(getMenuIdList);
@@ -405,7 +644,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         }
         Integer rowCount = dao.getSarStandardsInfoCount(page);
         page.getPager().setRowCount(rowCount);
-        List<SarStandardsInfo> sarlist = dao.getSarStandardsInfoPage(page,"999");
+        List<SarStandardsInfo> sarlist = dao.getSarStandardsInfoPage(page, "999");
         attrInfo(sarlist);
         return sarlist;
     }
@@ -413,12 +652,12 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
     @Override
     public List<SarStandardsInfo> getSarStandardsInfoPageBak1(SarStandardsInfoEOPage page) throws Exception {
         //查询当前登录人角色拥有权限的菜单
-        if(page.getMenuId() != null && page.getUserId() != null && StringUtils.isNotBlank(page.getUserId())){
+        if (page.getMenuId() != null && page.getUserId() != null && StringUtils.isNotBlank(page.getUserId())) {
             QueryWrapper<TsResource> qw = new QueryWrapper<>();
-            qw.eq("ID",page.getMenuId());
+            qw.eq("ID", page.getMenuId());
             qw.isNull("PARENT_ID");
             List<TsResource> children = iTsResourceService.list(qw);
-            if(children.isEmpty() && !page.getMenuId().equals("nomenu")){
+            if (children.isEmpty() && !page.getMenuId().equals("nomenu")) {
                 List<String> getMenuIdList = tsUserService.getResourceUserId(page.getUserId());
                 if (getMenuIdList != null && !getMenuIdList.isEmpty()) {
                     page.setMenuRoleList(getMenuIdList);
@@ -433,7 +672,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         }
         Integer rowCount = dao.getSarStandardsInfoCount(page);
         page.getPager().setRowCount(rowCount);
-        List<SarStandardsInfo> sarlist = dao.getSarStandardsInfoPage(page,"0");
+        List<SarStandardsInfo> sarlist = dao.getSarStandardsInfoPage(page, "0");
         attrInfo(sarlist);
         return sarlist;
     }
@@ -441,12 +680,12 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
     @Override
     public List<SarStandardsInfo> selectHighLawsById(SarStandardsInfoEOPage page) throws Exception {
         //查询当前登录人角色拥有权限的菜单
-        if(page.getMenuId() != null && page.getUserId() != null && StringUtils.isNotBlank(page.getUserId())){
+        if (page.getMenuId() != null && page.getUserId() != null && StringUtils.isNotBlank(page.getUserId())) {
             QueryWrapper<TsResource> qw = new QueryWrapper<>();
-            qw.eq("ID",page.getMenuId());
+            qw.eq("ID", page.getMenuId());
             qw.isNull("PARENT_ID");
             List<TsResource> children = iTsResourceService.list(qw);
-            if(children.isEmpty() && !page.getMenuId().equals("nomenu")){
+            if (children.isEmpty() && !page.getMenuId().equals("nomenu")) {
                 List<String> getMenuIdList = tsUserService.getResourceUserId(page.getUserId());
                 if (getMenuIdList != null && !getMenuIdList.isEmpty()) {
                     page.setMenuRoleList(getMenuIdList);
@@ -459,10 +698,10 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                 }
             }
         }
-        List<String> lawsIds=new ArrayList<>();
-        if ("1".equals(page.getQdFlag())){
+        List<String> lawsIds = new ArrayList<>();
+        if ("1".equals(page.getQdFlag())) {
 
-            SarFindDto sarFindDto=new SarFindDto();
+            SarFindDto sarFindDto = new SarFindDto();
             sarFindDto.setId(page.getQdid());
             sarFindDto.setStandEnName(page.getStandEnName());
             sarFindDto.setStandName(page.getStandName());
@@ -475,13 +714,13 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
             sarFindDto.setStandNumber(page.getStandNumber());
             sarFindDto.setStandType(page.getStandType());
 
-            lawsIds = sarLawsAttrDetailedListDao.selectHighLawsId(sarFindDto.getId(),sarFindDto);
+            lawsIds = sarLawsAttrDetailedListDao.selectHighLawsId(sarFindDto.getId(), sarFindDto);
 
         }
 
-        Integer rowCount = dao.selectHighLawsCount(page,lawsIds);
+        Integer rowCount = dao.selectHighLawsCount(page, lawsIds);
         page.getPager().setRowCount(rowCount);
-        List<SarStandardsInfo> sarlist = dao.selectHighLawsPage(page,"0",lawsIds);
+        List<SarStandardsInfo> sarlist = dao.selectHighLawsPage(page, "0", lawsIds);
         attrInfo(sarlist);
         return sarlist;
     }
@@ -501,9 +740,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
      */
     public void attrInfoCollect(List<SarStandardsInfo> sarlist) throws Exception {
         List<String> collectResIds = sarlist.stream().map(SarStandardsInfo::getId).collect(Collectors.toList());
-        Map<String,String> collectMap = personCollectEOService.queryCollectByUserAndIds(collectResIds);
+        Map<String, String> collectMap = personCollectEOService.queryCollectByUserAndIds(collectResIds);
         for (SarStandardsInfo row : sarlist) {
-            if(collectMap != null && collectMap.get(row.getId()) != null){
+            if (collectMap != null && collectMap.get(row.getId()) != null) {
                 row.setCollectId(collectMap.get(row.getId()));
             }
         }
@@ -606,17 +845,17 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         }
     }
 
-    public void attrInfoSearchDetails(SarStandardsInfo row,String type) throws Exception {
+    public void attrInfoSearchDetails(SarStandardsInfo row, String type) throws Exception {
         String fieldInfo = InitStandAttrUtil.queryField;
         String collectId = personCollectEOService.queryCollectByUserAndId(row.getId());
         row.setCollectId(collectId);
         // 查询属性表数据
         if (StringUtils.isNotBlank(fieldInfo)) {
             Map<String, Object> getAttrMap = new TreeMap<>();
-            if(type.equals("add")){
+            if (type.equals("add")) {
                 String sarStandAttrEOStr = row.getSarStandAttrEOStr();
                 getAttrMap = JSONObject.fromObject(sarStandAttrEOStr);
-            }else {
+            } else {
                 getAttrMap = sarStandAttrInfoEODao.selectStandFieldAndData(fieldInfo, row.getId());
             }
             if (InitStandAttrUtil.clobFieldList != null && !InitStandAttrUtil.clobFieldList.isEmpty()) {
@@ -647,7 +886,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                 String value = entry.getValue().toString();
                 if (StringUtils.isNotBlank(value)) {
                     List<AttFileEO> fileObj = attFileEOService.getMultiFileInfos(value);
-                    if(!fileObj.isEmpty()){
+                    if (!fileObj.isEmpty()) {
                         resultMap.put(newKey + "Name", fileObj.get(0).getOldFileName());
                     }
                 }
@@ -672,7 +911,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                 List<String> itemExistList = sarFileSplitInfoEOS.stream()
                         .map(item -> item.getFileType())
                         .collect(Collectors.toList());
-                getAttrMap.put("itemExistList",itemExistList);
+                getAttrMap.put("itemExistList", itemExistList);
 
                 for (Map.Entry<String, Object> entry : getAttrMap.entrySet()) {
                     String name = entry.getKey();
@@ -683,43 +922,44 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                             List<AttFileEO> fileObj = attFileEOService.getMultiFileInfosOrderByDateDesc(value);
                             entry.setValue(fileObj);
                         }
-                    }else if (entry.getValue() != null && InitStandAttrUtil.selectionFieldList != null && InitStandAttrUtil.selectionFieldList.size() > 0 && InitStandAttrUtil.selectionFieldList.contains(name)) {
+                    } else if (entry.getValue() != null && InitStandAttrUtil.selectionFieldList != null && InitStandAttrUtil.selectionFieldList.size() > 0 && InitStandAttrUtil.selectionFieldList.contains(name)) {
                         value = entry.getValue().toString();
                         List<String> valArr = Arrays.asList(value.split(","));
 
-                        switch (name){
+                        switch (name) {
                             //通过id绑定责任工程师名称
-                            case "ZRGCS":{
+                            case "ZRGCS": {
                                 QueryWrapper<TsUser> tsUserQW = new QueryWrapper<>();
                                 tsUserQW.select("UNAME")
-                                        .in("USID",valArr);
-                                List<String> stringList = tsUserService.listObjs(tsUserQW, o ->o.toString());
-                                value= String.join(",", stringList.isEmpty() ? valArr : stringList);
+                                        .in("USID", valArr);
+                                List<String> stringList = tsUserService.listObjs(tsUserQW, o -> o.toString());
+                                value = String.join(",", stringList.isEmpty() ? valArr : stringList);
                                 break;
                             }
                             //通过id绑定责任部门师名称
-                            case "ZRBM":{
+                            case "ZRBM": {
                                 QueryWrapper<TsPosition> tsPositionQW = new QueryWrapper<>();
                                 tsPositionQW.select("name")
-                                        .in("id",valArr);
+                                        .in("id", valArr);
                                 List<String> stringList = iTsPositionService.listObjs(tsPositionQW, o -> o.toString());
-                                value= String.join(",", stringList.isEmpty() ? valArr : stringList);
+                                value = String.join(",", stringList.isEmpty() ? valArr : stringList);
                                 break;
                             }
-                            default:value = dicTypeEODao.getDicNamesByCodes(valArr,"");
+                            default:
+                                value = dicTypeEODao.getDicNamesByCodes(valArr, "");
                         }
 
 
-                        entry.setValue(value == null ? String.join(",",valArr) : value);
+                        entry.setValue(value == null ? String.join(",", valArr) : value);
                     }
                 }
             }
         }
     }
 
-    public void attrInfoShowSearchDetails(SarStandardsInfo row,String type) throws Exception {
+    public void attrInfoShowSearchDetails(SarStandardsInfo row, String type) throws Exception {
         if (row != null) {
-            attrInfoSearchDetails(row,type);
+            attrInfoSearchDetails(row, type);
             Map<String, Object> getAttrMap = row.getAttrInfoMap();
             if (getAttrMap != null && getAttrMap.size() > 0) {
                 for (Map.Entry<String, Object> entry : getAttrMap.entrySet()) {
@@ -727,16 +967,16 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                     String value = "";
                     List<String> valArr = new ArrayList<>();
                     if (entry.getValue() != null && InitStandAttrUtil.selectionFieldList != null && InitStandAttrUtil.selectionFieldList.size() > 0 && InitStandAttrUtil.selectionFieldList.contains(name)) {
-                        if(StringUtils.isNotBlank(entry.getValue().toString())){
-                            Object json= new JSONTokener(entry.getValue().toString()).nextValue();
-                            if(json instanceof org.json.JSONArray){
-                                valArr = com.alibaba.fastjson.JSONObject.parseArray(entry.getValue().toString(),String.class);
-                            }else {
+                        if (StringUtils.isNotBlank(entry.getValue().toString())) {
+                            Object json = new JSONTokener(entry.getValue().toString()).nextValue();
+                            if (json instanceof org.json.JSONArray) {
+                                valArr = com.alibaba.fastjson.JSONObject.parseArray(entry.getValue().toString(), String.class);
+                            } else {
                                 value = entry.getValue().toString();
                                 valArr = Arrays.asList(value.split(","));
                             }
-                            if(!valArr.isEmpty()){
-                                value = dicTypeEODao.getDicNamesByCodes(valArr,"");
+                            if (!valArr.isEmpty()) {
+                                value = dicTypeEODao.getDicNamesByCodes(valArr, "");
                             }
                         }
                         entry.setValue(value);
@@ -784,7 +1024,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                                 }
                             } else {
                                 List<String> valArr = Arrays.asList(value.split(","));
-                                value = dicTypeEODao.getDicNamesByCodes(valArr,"");
+                                value = dicTypeEODao.getDicNamesByCodes(valArr, "");
                             }
                         }
                         entry.setValue(value);
@@ -795,13 +1035,13 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         }
     }
 
-    public void  attrInfoShowExport(List<SarStandardsInfo> sarlist) throws Exception {
+    public void attrInfoShowExport(List<SarStandardsInfo> sarlist) throws Exception {
 
         //查询字典表,形成Hash映射提升速度
         List<DicTypeEO> dicInfo = dicTypeEODao.getDicInfo("dic_type_code", "dic_type_name");
         Map<String, String> dicMap = dicInfo.stream()
-                .filter(item-> !item.getDicTypeCode().isEmpty())
-                .collect(Collectors.toMap(DicTypeEO::getDicTypeCode,DicTypeEO::getDicTypeName,(value1, value2 )->value2));
+                .filter(item -> !item.getDicTypeCode().isEmpty())
+                .collect(Collectors.toMap(DicTypeEO::getDicTypeCode, DicTypeEO::getDicTypeName, (value1, value2) -> value2));
 
 
         for (SarStandardsInfo row : sarlist) {
@@ -815,7 +1055,6 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                     String value = "";
 
 
-
                     if ("SVPPS".equals(name)) {
                         Object svpps = entry.getValue();
                         if (svpps != null && StringUtils.isNotBlank(svpps.toString())) {
@@ -844,28 +1083,28 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
 //
 //
 //                            } else {
-                                /**
-                                 *============================ 对getAttrMap的value赋值中文名称===============================
-                                 */
-                                if(entry.getValue()!=null) {
-                                    StringBuilder builder = new StringBuilder("");
-                                    for (String s : entry.getValue().toString().split(",")) {
-                                        if (dicMap.containsKey(s) && !"ZRBM".equals(name)){
-                                            builder.append(dicMap.get(s)+"  ");
-                                        }
-
-                                    }
-
-
-                                    if (builder.toString().isEmpty()){
-                                        getAttrMap.put(name, entry.getValue().toString());
-                                    }else {
-                                        getAttrMap.put(name, builder.toString());
-                                    }
+                        /**
+                         *============================ 对getAttrMap的value赋值中文名称===============================
+                         */
+                        if (entry.getValue() != null) {
+                            StringBuilder builder = new StringBuilder("");
+                            for (String s : entry.getValue().toString().split(",")) {
+                                if (dicMap.containsKey(s) && !"ZRBM".equals(name)) {
+                                    builder.append(dicMap.get(s) + "  ");
                                 }
-                                /**
-                                 *============================ 对getAttrMap的value赋值中文名称===============================
-                                 */
+
+                            }
+
+
+                            if (builder.toString().isEmpty()) {
+                                getAttrMap.put(name, entry.getValue().toString());
+                            } else {
+                                getAttrMap.put(name, builder.toString());
+                            }
+                        }
+                        /**
+                         *============================ 对getAttrMap的value赋值中文名称===============================
+                         */
 //                            }
 
 //                        entry.setValue(value);
@@ -915,8 +1154,8 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         int insertResult = dao.insertSelective(sarStandardsInfoEO);
         if (insertResult > 0) {
             // 修改属性表数据
-            List<SarStandAttrInfo> standAttrInfos = sarStandAttrInfoEODao.selectList(new QueryWrapper<SarStandAttrInfo>().eq("STAND_ID",sarStandardsInfoEO.getId()));
-            if(!standAttrInfos.isEmpty()){
+            List<SarStandAttrInfo> standAttrInfos = sarStandAttrInfoEODao.selectList(new QueryWrapper<SarStandAttrInfo>().eq("STAND_ID", sarStandardsInfoEO.getId()));
+            if (!standAttrInfos.isEmpty()) {
                 sarStandAttrInfoEODao.deleteStandAttrByStandId(standAttrInfos.get(0).getStandId());
             }
             //编写预警信息
@@ -939,9 +1178,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
             }
             String content = "入库" + number + " 《" + sarStandardsInfoEO.getStandName() + "》";
             sarUpdLogEOService.createBaseLog(sarStandardsInfoEO.getId(), sarStandardsInfoEO.getStandType() + "_STAND", content);
-            if(elasflag) {
+            if (elasflag) {
                 // 消息队列
-                attrInfoShowSearchDetails(sarStandardsInfoEO,"add");
+                attrInfoShowSearchDetails(sarStandardsInfoEO, "add");
                 FindSarItemsPageReqDTO pageInfo = new FindSarItemsPageReqDTO();
                 pageInfo.setStandId(sarStandardsInfoEO.getId());
                 pageInfo.setFileType("FBGBJBD");
@@ -953,12 +1192,12 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                  */
 
                 List<SarStandItems> sarItemVOS = standItemsDao.querySarItemAndInterpretation(pageInfo);
-                if(!sarItemVOS.isEmpty()){
-                    Map<String,String> collectMap = sarItemVOS.stream().filter((e) -> e.getItemsNum() != null && e.getItemsName() != null)
+                if (!sarItemVOS.isEmpty()) {
+                    Map<String, String> collectMap = sarItemVOS.stream().filter((e) -> e.getItemsNum() != null && e.getItemsName() != null)
                             .collect(Collectors.toMap(SarStandItems::getItemsNum, SarStandItems::getTermsConditions));
                     sarStandardsInfoEO.setMapItems(collectMap);
                 }
-                createStandMQService.sendStandMQ(sarStandardsInfoEO,"add");
+                createStandMQService.sendStandMQ(sarStandardsInfoEO, "add");
             }
         }
     }
@@ -994,7 +1233,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                         sarStandardsInfoEO.setRelateStand(attrValue);
                     } else if ("DTBJH".equals(attrKey)) {
                         sarStandardsInfoEO.setReplaceStandNum(attrValue);
-                    }else if ("BFDTBZ".equals(attrKey)) {
+                    } else if ("BFDTBZ".equals(attrKey)) {
                         sarStandardsInfoEO.setReplacePartStandNum(attrValue);
                     }
                     // 多选项，文件类型需要单独处理 向子表添加数据
@@ -1002,7 +1241,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                         selectionMap.put(attrKey, attrValue);
                     } else if (InitStandAttrUtil.fileFieldList.contains(attrKey)) {
                         fileMap.put(attrKey, attrValue);
-                        List<String> list= Arrays.asList(attrValue .split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList());
+                        List<String> list = Arrays.asList(attrValue.split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList());
                         fileIds.addAll(list);
 //                        String attrValueStr = String.join(",", list);
 //                        fileIds += attrValueStr + ",";
@@ -1026,9 +1265,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                 }
             }
         }
-        if(!fileIds.isEmpty()){
+        if (!fileIds.isEmpty()) {
             sarStandardsInfoEO.setFileIds(String.join(",", fileIds));
-        }else {
+        } else {
             sarStandardsInfoEO.setFileIds("");
         }
         String insertField = mustFields + fieldsBuilder.toString();
@@ -1153,13 +1392,12 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         }
     }
 
-    private Boolean verifyFileType(String str){
+    private Boolean verifyFileType(String str) {
         String verifyType = "^PPT|PPTX|ppt|pptx|PDF|pdf|DOC|doc|DOCX|docx*$";
-        return Pattern.matches(verifyType,str);
+        return Pattern.matches(verifyType, str);
     }
 
 
-
     public void createStandPutTime(String standId, Map<String, String> multiTimeMap) throws Exception {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         if (multiTimeMap != null && multiTimeMap.size() > 0) {
@@ -1188,7 +1426,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                         }
 
 
-                        if ("SSRQ".equals(field) || "XCXSSRQ".equals(field) || "ZCCSSRQ".equals(field)){
+                        if ("SSRQ".equals(field) || "XCXSSRQ".equals(field) || "ZCCSSRQ".equals(field)) {
                             WarningDate warningDate = new WarningDate();
                             warningDate.setId(UUIDUtils.randomUUID20());
                             warningDate.setLawId(standId);
@@ -1204,9 +1442,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                 sarStandPutTimeEODao.insertForeach(standTimeList);
             }
 
-            if (warningDateList != null && warningDateList.size()>0){
+            if (warningDateList != null && warningDateList.size() > 0) {
                 QueryWrapper<WarningDate> wrapper = new QueryWrapper<>();
-                wrapper.eq("law_id",standId);
+                wrapper.eq("law_id", standId);
                 warningDateService.remove(wrapper);
                 warningDateService.saveBatch(warningDateList);
             }
@@ -1240,9 +1478,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
             newCiteStand = sarStandardsInfoEO.getRelateStand();
         } else if ("DTBJH".equals(upField)) {
             newCiteStand = sarStandardsInfoEO.getReplaceStandNum();
-        }else if ("DTBZH".equals(upField)) {
+        } else if ("DTBZH".equals(upField)) {
             newCiteStand = sarStandardsInfoEO.getReplaceStandNum();
-        }else if ("BFDTBZ".equals(upField)) {
+        } else if ("BFDTBZ".equals(upField)) {
             newCiteStand = sarStandardsInfoEO.getReplacePartStandNum();
         }
         if (StringUtils.isNotEmpty(newCiteStand) && newCiteStand.split(",").length > 0) {
@@ -1499,7 +1737,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
     }
 
 
-    private void associatedCollection(SarStandardsInfo standInfo){
+    private void associatedCollection(SarStandardsInfo standInfo) {
         /**
          * 获取代替标准号
          * 判断getAttrInfoMap, dtbzh.get("DTBJH") 不为空
@@ -1511,7 +1749,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                 .map(str -> str.toString())
                 .orElse("");
 
-        if (!"".equals(DTBJH)){
+        if (!"".equals(DTBJH)) {
 
             for (String s : DTBJH.split(",")) {
 
@@ -1524,7 +1762,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                 //用户id
                 query.setUserId(LoginUserUtil.getUserId());
                 query.setStandCode(s);
-                if (personCollectEOService.countPersonCollectByStandInfo(query)>0){
+                if (personCollectEOService.countPersonCollectByStandInfo(query) > 0) {
 
                     TsPersonCollect tsPersonCollect = new TsPersonCollect();
                     tsPersonCollect.setId(UUIDUtils.randomUUID20());
@@ -1532,13 +1770,13 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                     tsPersonCollect.setCreationTime(new Date());
                     tsPersonCollect.setModifyTime(new Date());
                     tsPersonCollect.setCollectResId(standInfo.getId());
-                    tsPersonCollect.setCollectType(standInfo.getStandType()+"_STAND");
-                    tsPersonCollect.setCollectTitle(standInfo.getStandName() +"(编号:"+ standInfo.getStandSort()+" "+standInfo.getStandNumber()+"-"+standInfo.getStandYear()+  ")");
+                    tsPersonCollect.setCollectType(standInfo.getStandType() + "_STAND");
+                    tsPersonCollect.setCollectTitle(standInfo.getStandName() + "(编号:" + standInfo.getStandSort() + " " + standInfo.getStandNumber() + "-" + standInfo.getStandYear() + ")");
                     tsPersonCollect.setUserId(LoginUserUtil.getUserId());
                     QueryWrapper<TsPersonCollect> ew = new QueryWrapper<>();
-                    ew.eq("COLLECT_RES_ID",standInfo.getId())
-                            .eq("VALID_FLAG",'0');
-                    personCollectEOService.saveOrUpdate(tsPersonCollect,ew);
+                    ew.eq("COLLECT_RES_ID", standInfo.getId())
+                            .eq("VALID_FLAG", '0');
+                    personCollectEOService.saveOrUpdate(tsPersonCollect, ew);
 
                     break;
                 }
@@ -1568,8 +1806,6 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         //2.判断修改的标准的"国家/地区"与清单中的是否一致,一致则添加到清单中,不一致不作处理
 
 
-
-
         String standId = sarStandardsInfoEO.getId();
         // 查询修改前数据信息，为修改代替标准号使用
         SarStandardsInfo beforeSarStandardsInfo = dao.selectById(standId);
@@ -1618,7 +1854,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
 
                 try {
                     updateStandardsMenu(standardsInfoEO);
-                }catch (NullPointerException e){
+                } catch (NullPointerException e) {
                     updateStandInfo(standardsInfoEO);
                 }
             }
@@ -1642,8 +1878,8 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
 //        replaseStandState(sarStandardsInfoEO);
         // 记录修改日志
         saveUpdateLog(sarStandardsInfoEO, beforeSarStandardsInfo);
-        if(elasflag) { //what?
-            attrInfoShowSearchDetails(sarStandardsInfoEO,"upd");
+        if (elasflag) { //what?
+            attrInfoShowSearchDetails(sarStandardsInfoEO, "upd");
             FindSarItemsPageReqDTO pageInfo = new FindSarItemsPageReqDTO();
             pageInfo.setStandId(sarStandardsInfoEO.getId());
             pageInfo.setFileType("FBGBJBD");
@@ -1654,12 +1890,12 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
              *  .collect(Collectors.toMap(SarItemVO::getItemsNum, SarItemVO::getItemsName));
              */
             List<SarStandItems> sarItemVOS = standItemsDao.querySarItemAndInterpretation(pageInfo);
-            if(!sarItemVOS.isEmpty()){
-                Map<String,String> collectMap = sarItemVOS.stream().filter((e) -> e.getItemsNum() != null && e.getItemsName() != null)
+            if (!sarItemVOS.isEmpty()) {
+                Map<String, String> collectMap = sarItemVOS.stream().filter((e) -> e.getItemsNum() != null && e.getItemsName() != null)
                         .collect(Collectors.toMap(SarStandItems::getItemsNum, SarStandItems::getTermsConditions));
                 sarStandardsInfoEO.setMapItems(collectMap);
             }
-            createStandMQService.sendStandMQ(sarStandardsInfoEO,"update");
+            createStandMQService.sendStandMQ(sarStandardsInfoEO, "update");
         }
         return result;
     }
@@ -1672,9 +1908,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
             newMap = JSONObject.fromObject(attrStr);
         }
         //更新日志bug修复
-        Map<String,String> map=new HashMap<>();
-        map.put("1","是");
-        map.put("2","否");
+        Map<String, String> map = new HashMap<>();
+        map.put("1", "是");
+        map.put("2", "否");
         sarStandardsInfoEO.setIsRelateAccess(map.get(sarStandardsInfoEO.getIsRelateAccess()));
         beforeSarStandardsInfo.setIsRelateAccess(map.get(beforeSarStandardsInfo.getIsRelateAccess()));
 
@@ -1691,7 +1927,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
 
     public Map<String, Object> changeMap(SarStandardsInfo sarStandardsInfoEO, Map<String, Object> map) {
 //        map.put("country", sarStandardsInfoEO.getCountry());
-        if(map == null){
+        if (map == null) {
             map = new TreeMap<String, Object>();
         }
         map.put("standSystem", verifyObj(sarStandardsInfoEO.getStandSystem()));
@@ -1713,7 +1949,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         return map;
     }
 
-    private Object verifyObj(Object str){
+    private Object verifyObj(Object str) {
         return str == null ? "" : str;
     }
 
@@ -1731,11 +1967,11 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         sarStandardsInfoEO.setModifyTime(new Date());
         int countResult = 0;
         //如果清单下挂着标准A，在标准库里删除标准A的话，加个验证 不让删这个标准
-        for (String id : idArr){
-            detailedListQueryWrapper.eq("stand_id",id);
+        for (String id : idArr) {
+            detailedListQueryWrapper.eq("stand_id", id);
 
             int count = detailedListService.count(detailedListQueryWrapper);
-            if (count>0){
+            if (count > 0) {
                 countResult = -1;
                 return countResult;
             }
@@ -1778,7 +2014,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
             personCollectEODao.deleteByResId(id);
             // 删除分享表中数据
             personShareEODao.deleteByResId(id);
-            if(elasflag) {
+            if (elasflag) {
                 //删除成功后，将索引中对应数据删除
                 StandLawsEO standLawsEO = new StandLawsEO();
                 standLawsEO.setId(sarStandardsInfoEO.getId());
@@ -1805,7 +2041,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                 standNum = getDelStandInfo.getStandSort() + " " + getDelStandInfo.getStandNumber();
             }
             sarStandardsInfoEOPage.setReplacedStandNum(standNum);
-            List<SarStandardsInfo> getReplacedStands = dao.getSarStandardsInfoPage(sarStandardsInfoEOPage,"0");
+            List<SarStandardsInfo> getReplacedStands = dao.getSarStandardsInfoPage(sarStandardsInfoEOPage, "0");
             if (getReplacedStands != null && !getReplacedStands.isEmpty()) {
                 for (SarStandardsInfo stand : getReplacedStands) {
                     SarStandardsInfo newStand = new SarStandardsInfo();
@@ -1849,12 +2085,12 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
             page = (SarStandardsInfoEOPage) JSONObject.toBean(jsonObject, SarStandardsInfoEOPage.class);
             page.setStandType(standardsInfoExcelVO.getStandType());
             //查询当前登录人角色拥有权限的菜单
-            if(page.getMenuId() != null && page.getUserId() != null && StringUtils.isNotBlank(page.getUserId())){
+            if (page.getMenuId() != null && page.getUserId() != null && StringUtils.isNotBlank(page.getUserId())) {
                 QueryWrapper<TsResource> qw = new QueryWrapper<>();
-                qw.eq("ID",page.getMenuId());
+                qw.eq("ID", page.getMenuId());
                 qw.isNull("PARENT_ID");
                 List<TsResource> children = iTsResourceService.list(qw);
-                if(children.isEmpty() && !page.getMenuId().equals("nomenu")){
+                if (children.isEmpty() && !page.getMenuId().equals("nomenu")) {
 //                    List<String> getMenuIdList = tsUserService.getResourceUserId(page.getUserId());
 //                    if (getMenuIdList != null && !getMenuIdList.isEmpty()) {
 //                        page.setMenuRoleList(getMenuIdList);
@@ -1875,7 +2111,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
 //                        sarAdvanceSearchVO.setField("STAND_SYSTEM");
 //                    }
 //                });
-                String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"sar_stand_attr_info");
+                String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList, "sar_stand_attr_info");
                 if (StringUtils.isNotBlank(advanceStr)) {
                     page.setAdvanceSearchStr(advanceStr);
                 } else {
@@ -1883,9 +2119,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                 }
             }
         }
-        if(standardsInfoExcelVO.getUserId() != null){
+        if (standardsInfoExcelVO.getUserId() != null) {
             page.setUserId(standardsInfoExcelVO.getUserId());
-        }else {
+        } else {
             page.setUserId(LoginUserUtil.getUserId());
         }
         if (null != page.getNowOrderBy()) {
@@ -2547,9 +2783,8 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
     }
 
 
-
     @Override
-    public List<SarStandardsInfo> getStandInfoByList(String limit){
+    public List<SarStandardsInfo> getStandInfoByList(String limit) {
 
 //        //查询文本状态为即将实施的
 //        QueryWrapper<TsDictionary> dictionaryWrapper = new QueryWrapper<>();
@@ -2598,9 +2833,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         }
         // 查询纳入清单的国家地区
         if (sarStandardsInfoEO != null) {
-            if(sarStandardsInfoEO.getStandSystem() != null){
+            if (sarStandardsInfoEO.getStandSystem() != null) {
                 SarMenuStandard menu = sarMenuStandardService.selectMenuById(sarStandardsInfoEO.getStandSystem());
-                if(menu != null){
+                if (menu != null) {
                     sarStandardsInfoEO.setStandSystemName(menu.getMenuName() == null ? "" : menu.getMenuName());
                 }
             }
@@ -2622,9 +2857,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         }
         // 查询纳入清单的国家地区
         if (sarStandardsInfoEO != null) {
-            if(sarStandardsInfoEO.getStandSystem() != null){
+            if (sarStandardsInfoEO.getStandSystem() != null) {
                 SarMenuStandard menu = sarMenuStandardService.selectMenuById(sarStandardsInfoEO.getStandSystem());
-                if(menu != null){
+                if (menu != null) {
                     sarStandardsInfoEO.setStandSystemName(menu.getMenuName() == null ? "" : menu.getMenuName());
                 }
             }
@@ -2715,12 +2950,12 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
     @Override
     public void insertIntoIndexForMap(Map<String, Object> attrInfoMap) {
         Set<String> keys = attrInfoMap.keySet();
-        for (String key:keys) {
+        for (String key : keys) {
             String value = String.valueOf(attrInfoMap.get(key));
-            if (StringUtils.isNotBlank(value) && !"null".equals(value) && !"SVPPS".equals(key)){
-                value = value.replace(" , ",",");
-                value = value.replace(","," , ");
-                attrInfoMap.put(key,value);
+            if (StringUtils.isNotBlank(value) && !"null".equals(value) && !"SVPPS".equals(key)) {
+                value = value.replace(" , ", ",");
+                value = value.replace(",", " , ");
+                attrInfoMap.put(key, value);
             }
         }
         // 根据文件attid 读取文件内容
@@ -2728,19 +2963,19 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
             String[] attidlist = String.valueOf(attrInfoMap.get("content")).split(" , ");
             StringBuilder content = new StringBuilder("");
             for (int i = 0; i < attidlist.length; i++) {
-                if(org.apache.commons.lang.StringUtils.isNotEmpty(attidlist[i]) ){
+                if (org.apache.commons.lang.StringUtils.isNotEmpty(attidlist[i])) {
                     AttFileEO attFileEO = attFileEOService.getFileInfo(attidlist[i]);
                     String readFilePath = filePath + "/" + attFileEO.getFilePath() + attFileEO.getFileName();
 //                    String readFilePath = "E:\\上汽企标流程总览.pdf";
                     try {
                         // 判断文件是docx还是PDF
-                        if (null != attFileEO.getFileSuffix() && (attFileEO.getFileSuffix().equals("docx") || attFileEO.getFileSuffix().equals("doc")|| attFileEO.getFileSuffix().equals("DOC")|| attFileEO.getFileSuffix().equals("DOCX") || attFileEO.getFileSuffix().equals("ppt") || attFileEO.getFileSuffix().equals("pptx"))) {
-                            if(attFileEO.getFileSuffix().equals("doc")||attFileEO.getFileSuffix().equals("docx") || attFileEO.getFileSuffix().equals("DOC")|| attFileEO.getFileSuffix().equals("DOCX")){
+                        if (null != attFileEO.getFileSuffix() && (attFileEO.getFileSuffix().equals("docx") || attFileEO.getFileSuffix().equals("doc") || attFileEO.getFileSuffix().equals("DOC") || attFileEO.getFileSuffix().equals("DOCX") || attFileEO.getFileSuffix().equals("ppt") || attFileEO.getFileSuffix().equals("pptx"))) {
+                            if (attFileEO.getFileSuffix().equals("doc") || attFileEO.getFileSuffix().equals("docx") || attFileEO.getFileSuffix().equals("DOC") || attFileEO.getFileSuffix().equals("DOCX")) {
                                 FileInputStream fis = new FileInputStream(readFilePath);
                                 WordExtractor wordExtractor = new WordExtractor(fis);
                                 String txt = wordExtractor.getText();
                                 content.append(txt);
-                            }else {
+                            } else {
                                 OPCPackage opcPackage = XWPFDocument.openPackage(readFilePath);
                                 XWPFWordExtractor extractor = new XWPFWordExtractor(opcPackage);
                                 String txt = extractor.getText();
@@ -2760,14 +2995,13 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                         }
                     } catch (Exception e) {
                         logger.error("搜索中心新增数据读取文档内容时失败");
-                        logger.error(e.getMessage(),e);
+                        logger.error(e.getMessage(), e);
                     }
-                    attrInfoMap.put("content",content.toString());
+                    attrInfoMap.put("content", content.toString());
                 }
             }
-        }
-        else{
-            attrInfoMap.put("content","");
+        } else {
+            attrInfoMap.put("content", "");
         }
         standLawsSearchService.addStandLawsSearchForMap(attrInfoMap);
     }
@@ -2775,12 +3009,12 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
     @Override
     public void updateIntoIndexForMap(Map<String, Object> attrInfoMap) {
         Set<String> keys = attrInfoMap.keySet();
-        for (String key:keys) {
+        for (String key : keys) {
             String value = String.valueOf(attrInfoMap.get(key));
-            if (com.adc.da.util.utils.StringUtils.isNotBlank(value) && !"null".equals(value) && !"SVPPS".equals(key) && !"content".equals(key)){
-                value = value.replace(" , ",",");
-                value = value.replace(","," , ");
-                attrInfoMap.put(key,value);
+            if (com.adc.da.util.utils.StringUtils.isNotBlank(value) && !"null".equals(value) && !"SVPPS".equals(key) && !"content".equals(key)) {
+                value = value.replace(" , ", ",");
+                value = value.replace(",", " , ");
+                attrInfoMap.put(key, value);
             }
         }
         // 根据文件attid 读取文件内容
@@ -2788,27 +3022,27 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
             String[] attidlist = String.valueOf(attrInfoMap.get("content")).split(",");
             StringBuilder content = new StringBuilder("");
             for (int i = 0; i < attidlist.length; i++) {
-                if(StringUtils.isNotEmpty(attidlist[i]) && !"null".equals(attidlist[i])){
+                if (StringUtils.isNotEmpty(attidlist[i]) && !"null".equals(attidlist[i])) {
                     AttFileEO attFileEO = attFileEOService.getFileInfo(attidlist[i]);
-                    if (null == attFileEO){
+                    if (null == attFileEO) {
                         continue;
                     }
                     String readFilePath = filePath + "/" + attFileEO.getFilePath() + attFileEO.getFileName();
                     try {
                         // 判断文件是docx还是PDF
                         if (attFileEO.getFileSuffix().equals("docx") || attFileEO.getFileSuffix().equals("doc")) {
-                            if(attFileEO.getFileSuffix().equals("doc")){
+                            if (attFileEO.getFileSuffix().equals("doc")) {
                                 FileInputStream fis = new FileInputStream(readFilePath);
                                 WordExtractor wordExtractor = new WordExtractor(fis);
                                 String txt = wordExtractor.getText();
                                 content.append(txt);
-                            }else {
+                            } else {
                                 OPCPackage opcPackage = XWPFDocument.openPackage(readFilePath);
                                 XWPFWordExtractor extractor = new XWPFWordExtractor(opcPackage);
                                 String txt = extractor.getText();
                                 content.append(txt);
                             }
-                        } else if (attFileEO.getFileSuffix().equals("pdf")){
+                        } else if (attFileEO.getFileSuffix().equals("pdf")) {
                             PDDocument document = PDDocument.load(new File(readFilePath));
                             document.getClass();
                             if (!document.isEncrypted()) {
@@ -2827,14 +3061,13 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
 //                        content.append(txt);
                     } catch (Exception e) {
                         logger.error("搜索中心修改数据读取文档内容时失败");
-                        logger.error(e.getMessage(),e);
+                        logger.error(e.getMessage(), e);
                     }
-                    attrInfoMap.put("content",content.toString());
+                    attrInfoMap.put("content", content.toString());
                 }
             }
-        }
-        else{
-            attrInfoMap.put("content","");
+        } else {
+            attrInfoMap.put("content", "");
         }
         standLawsSearchService.updateStandLawsSearchForMap(attrInfoMap);
     }
@@ -3089,7 +3322,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
 //        }
         Integer rowCount = dao.getSarStandardsInfoCount(page);
         page.getPager().setRowCount(rowCount);
-        List<SarStandardsInfo> sarlist = dao.getSarStandardsInfoPage(page,"0");
+        List<SarStandardsInfo> sarlist = dao.getSarStandardsInfoPage(page, "0");
         attrInfo(sarlist);
         return sarlist;
     }
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/regulations/RegulationsMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/regulations/RegulationsMapper.xml
index 0fc78990..9122daa3 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/regulations/RegulationsMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/regulations/RegulationsMapper.xml
@@ -62,11 +62,14 @@
     <select id="searchStandDataThree" resultMap="BaseResultMap">
         SELECT
         t.standId,
-        t.standType
+        t.standType,
+        t.standNum
         FROM (
         SELECT
         sar_standards_info.id AS standId,
-        sar_standards_info.STAND_TYPE AS standType
+        sar_standards_info.STAND_TYPE AS standType,
+        concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-',
+        SAR_STANDARDS_INFO.STAND_YEAR) as standNum
         FROM
         sar_standards_info
         LEFT JOIN SAR_STAND_ATTR_INFO ON (
@@ -82,6 +85,9 @@
             and (SAR_STAND_ATTR_INFO.KCCVPPSCN like concat('%',#{vppsName},'%') or SAR_STAND_ATTR_INFO.CYCVPPSCN like
             concat('%',#{vppsName},'%'))
         </if>
+        <if test="standId != null and standId != ''">
+            and sar_standards_info.ID = #{standId}
+        </if>
         <if test="standCode != null and standCode != ''">
             and (
             (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-',
@@ -93,7 +99,8 @@
         UNION
         SELECT
         sar_bussioness_stand.id AS standId,
-        'BUSINESS_STAND' AS standType
+        'BUSINESS_STAND' AS standType,
+        SAR_BUSSIONESS_STAND.STAND_CODE as standNum
         FROM
         sar_bussioness_stand
         LEFT JOIN sar_buss_stand_attr_info ON (
@@ -113,11 +120,15 @@
                 and (SAR_BUSSIONESS_STAND.STAND_CODE = #{standCode}
                 or REPLACE( SAR_BUSSIONESS_STAND.STAND_CODE,' ','') = REPLACE(   #{standCode},' ',''))
         </if>
+        <if test="standId != null and standId != ''">
+            and sar_bussioness_stand.ID = #{standId}
+        </if>
 
         UNION
         SELECT
         SAR_LAWS_STAND_INFO.id AS standId,
-        'LAWS_TYPE' AS standType
+        'LAWS_TYPE' AS standType,
+        SAR_LAWS_STAND_INFO.LAWS_NUMBER as standNum
         FROM
         SAR_LAWS_STAND_INFO
         LEFT JOIN sar_laws_attr_info ON (
@@ -129,7 +140,9 @@
         <if test="standCode != null and standCode != ''">
                 and SAR_LAWS_STAND_INFO.LAWS_NUMBER = #{standCode}
         </if>
-
+        <if test="standId != null and standId != ''">
+            and SAR_LAWS_STAND_INFO.ID = #{standId}
+        </if>
         ) t
     </select>
 </mapper>