diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java
index a279368a..6839bfd9 100644
--- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java
+++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java
@@ -176,13 +176,13 @@ public class ActSarItemsEOService {
             }
             String standFoUser = "";
             List<Map<String,Object>> itemData = new ArrayList<>();
-            if (breakVal != null) {
-                //取出taskbreak中的部分标准信息放到map中，如fo,svpps,责任部门，项目评估角色
-                String valueStr = String.valueOf(breakVal);
-                jsonArray = JSONArray.parseArray(valueStr,String.class);
-                // 处理在标准、条款中的SVPPS、项目评估角色、责任部门、FO
-                handleStandCollectData(attInfoMap,jsonArray,itemData);
-            }
+//            if (breakVal != null) {
+//                //取出taskbreak中的部分标准信息放到map中，如fo,svpps,责任部门，项目评估角色
+//                String valueStr = String.valueOf(breakVal);
+//                jsonArray = JSONArray.parseArray(valueStr,String.class);
+//                // 处理在标准、条款中的SVPPS、项目评估角色、责任部门、FO
+//                handleStandCollectData(attInfoMap,jsonArray,itemData);
+//            }
             //处理文件
             //此处需要处理之前的文件信息，防止文件丢失
 //            attInfoMap = saveFileMsg(attInfoMap,sarStandardsInfoEO.getFileIds(),sarStandardsInfoEO.getTextStatus());
@@ -273,12 +273,12 @@ public class ActSarItemsEOService {
                 // 编辑相关流程
                 sarStandAttrInfoEOService.updateStandInfo(sarStandardsInfoEO.getId(),"XGLC",prcNum);
             }
-            List<SarStandItems> allItems = new ArrayList<>();
+//            List<SarStandItems> allItems = new ArrayList<>();
             //开始处理条款数据，从去重后的结果中直接处理即可
-            if(itemData!=null && !itemData.isEmpty()){
-                // allItems =
-                saveStandItemsData(itemData, sarStandardsInfoEO);
-            }
+//            if(itemData!=null && !itemData.isEmpty()){
+//                // allItems =
+//                saveStandItemsData(itemData, sarStandardsInfoEO);
+//            }
             //技术评估结果入库  重构技术评估结果入库内容
 //            if ("0".equals(isJudge)) {
 //                saveCompStatusInfo(sarStandardsInfoEO,breakVal,allItems,prcNum);
@@ -852,6 +852,25 @@ public class ActSarItemsEOService {
                     addAttInfoMap.put("FBGBJBD",fileStr);
                 }
             }
+        }else if(oldAttInfoMap.containsKey("FBGYWBD")){
+            String fileStr = (String) oldAttInfoMap.get("FBGYWBD");
+            if(StringUtils.isNotBlank(fileStr)){
+                String newFileStr =addAttInfoMap.containsKey("FBGYWBD")?(String)addAttInfoMap.get("FBGYWBD"):null;
+                if(StringUtils.isNotBlank(newFileStr)){
+                    String[] fileSplit = fileStr.split(",");
+                    String[] newFileSplit = newFileStr.split(",");
+                    Set<String> fileSet = new HashSet<>();
+                    for(String sData:fileSplit){
+                        fileSet.add(sData);
+                    }
+                    for(String sData:newFileSplit){
+                        fileSet.add(sData);
+                    }
+                    addAttInfoMap.put("FBGYWBD",StringUtils.join(fileSet.toArray(), ","));
+                }else{
+                    addAttInfoMap.put("FBGYWBD",fileStr);
+                }
+            }
         }
     }
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
index cf976fb7..1aa28ad0 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
@@ -1354,7 +1354,8 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
             }
         }
         //配置列表显示的数据权限
-        if ("1".equals(page.getIsKU())) {
+        //63e999c65b1f2b1339119a00eb1d50cf
+        if ("1".equals(page.getIsKU()) && !"qbwdsc".equals(page.getCollectMenuId())) {
             List<SarBussionessStand> sarlist = new ArrayList<>();
             List<String> access = tsUserService.getResourceDataUserId(page.getUserId());
             if (null == page.getMenuId() && null == page.getMenuAllChildrenIdList()) {
@@ -1379,6 +1380,10 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                 return sarlist;
             }
         }else {
+            if ("qbwdsc".equals(page.getCollectMenuId())){
+                page.setMenuRoleList(null);
+                page.setMenuId(null);
+            }
             Integer rowCount = this.baseMapper.getBussionessStandInfoCount(page);
             page.getPager().setRowCount(rowCount);
             List<SarBussionessStand> sarlist = this.baseMapper.getBussionessStandInfoPage(page);
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java
index 05aea921..abb9b05e 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java
@@ -136,154 +136,159 @@ public class SarLawsAttrDetailedListController extends BaseController<SarLawsAtt
             List<LawsDto> data = new ArrayList<>();
             if (CollectionUtils.isEmpty(standExcelVo.getIds())){
                 List<String> list=  sarLawsAttrDetailedListDao.selectLawsId2(standExcelVo.getId());
-                if (CollectionUtils.isEmpty(list)) return;
-                data=sarLawsAttrDetailedListDao.selectLawsByIdE(list);
+                if (!CollectionUtils.isEmpty(list)) {
+                    data = sarLawsAttrDetailedListDao.selectLawsByIdE(list);
+                }
             }else {
                 data=sarLawsAttrDetailedListDao.selectLawsByIdE(standExcelVo.getIds());
             }
-            if ("1".equals(type)){
-                List<String> lawsIds=new ArrayList<>();
-                SarFindDto sarFindDto=new SarFindDto();
-                sarFindDto.setId(standExcelVo.getId());
-                data.forEach(lawsDto -> {lawsIds.add(lawsDto.getId());});
-                List<LawsDto> list = sarLawsAttrDetailedListDao.selectLawsById(lawsIds,sarFindDto);
-                for (LawsDto lawsDto:data){
-                    if (StringUtils.isNoneEmpty(lawsDto.getApplyArctic())){
-                        lawsDto.setApplyArctic(lawsDto.getApplyArctic());
-                    }
-                    QueryWrapper<SarLawsAttrDetailedList> queryWrapper = new QueryWrapper<>();
-                    queryWrapper.eq("stand_id",lawsDto.getId())
-                            .eq("detailed_list_id",sarFindDto.getId());
-                    List<SarLawsAttrDetailedList> sarLawsAttrDetailedLists = sarLawsAttrDetailedListDao.selectList(queryWrapper);
-                    if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getSsrq()) && "null" != sarLawsAttrDetailedLists.get(0).getSsrq()) {
-                        lawsDto.setSSRQ(sarLawsAttrDetailedLists.get(0).getSsrq());
-                    }
-                    if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getXcxssrq()) && "null" != sarLawsAttrDetailedLists.get(0).getXcxssrq()) {
-                        lawsDto.setXCXSSRQGJ(sarLawsAttrDetailedLists.get(0).getXcxssrq());
-                    }
-                    if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getZccssrq()) && "null" != sarLawsAttrDetailedLists.get(0).getZccssrq()) {
-                        lawsDto.setZCCSSRQGJ(sarLawsAttrDetailedLists.get(0).getZccssrq());
-                    }
-                    if ("INLAND".equals(lawsDto.getStandType())) lawsDto.setStandType("INLAND_STAND");
-                    if ("FOREIGN".equals(lawsDto.getStandType())) lawsDto.setStandType("FOREIGN_STAND");
+            if (!CollectionUtils.isEmpty(data)) {
+                if ("1".equals(type)) {
+                    List<String> lawsIds = new ArrayList<>();
+                    SarFindDto sarFindDto = new SarFindDto();
+                    sarFindDto.setId(standExcelVo.getId());
+                    data.forEach(lawsDto -> {
+                        lawsIds.add(lawsDto.getId());
+                    });
+                    List<LawsDto> list = sarLawsAttrDetailedListDao.selectLawsById(lawsIds, sarFindDto);
+                    for (LawsDto lawsDto : data) {
+                        if (StringUtils.isNoneEmpty(lawsDto.getApplyArctic())) {
+                            lawsDto.setApplyArctic(lawsDto.getApplyArctic());
+                        }
+                        QueryWrapper<SarLawsAttrDetailedList> queryWrapper = new QueryWrapper<>();
+                        queryWrapper.eq("stand_id", lawsDto.getId())
+                                .eq("detailed_list_id", sarFindDto.getId());
+                        List<SarLawsAttrDetailedList> sarLawsAttrDetailedLists = sarLawsAttrDetailedListDao.selectList(queryWrapper);
+                        if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getSsrq()) && "null" != sarLawsAttrDetailedLists.get(0).getSsrq()) {
+                            lawsDto.setSSRQ(sarLawsAttrDetailedLists.get(0).getSsrq());
+                        }
+                        if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getXcxssrq()) && "null" != sarLawsAttrDetailedLists.get(0).getXcxssrq()) {
+                            lawsDto.setXCXSSRQGJ(sarLawsAttrDetailedLists.get(0).getXcxssrq());
+                        }
+                        if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getZccssrq()) && "null" != sarLawsAttrDetailedLists.get(0).getZccssrq()) {
+                            lawsDto.setZCCSSRQGJ(sarLawsAttrDetailedLists.get(0).getZccssrq());
+                        }
+                        if ("INLAND".equals(lawsDto.getStandType())) lawsDto.setStandType("INLAND_STAND");
+                        if ("FOREIGN".equals(lawsDto.getStandType())) lawsDto.setStandType("FOREIGN_STAND");
 
+                    }
                 }
-            }
-            //适用车型
-            Map<String,Object> map= iDicTypeEOService.getDicTypeListCode();
-            List<Map<String, String>> typeApplicable = (List<Map<String, String>>)map.get("ENERGYTYPES");
-            for (LawsDto list1:data){
-                if (StringUtils.isNotBlank(list1.getTypeApplicable()) && list1.getTypeApplicable().contains(",")){
-                    String[] split = list1.getTypeApplicable().split(",");
-                    StringBuilder builder = new StringBuilder();
-                    for (String s:split){
-                        for (Map<String,String> map1:typeApplicable) {
-                            if (map1.get("value").equals(s)){
-                                s=map1.get("label");
-                                builder.append(s+",");
+                //适用车型
+                Map<String, Object> map = iDicTypeEOService.getDicTypeListCode();
+                List<Map<String, String>> typeApplicable = (List<Map<String, String>>) map.get("ENERGYTYPES");
+                for (LawsDto list1 : data) {
+                    if (StringUtils.isNotBlank(list1.getTypeApplicable()) && list1.getTypeApplicable().contains(",")) {
+                        String[] split = list1.getTypeApplicable().split(",");
+                        StringBuilder builder = new StringBuilder();
+                        for (String s : split) {
+                            for (Map<String, String> map1 : typeApplicable) {
+                                if (map1.get("value").equals(s)) {
+                                    s = map1.get("label");
+                                    builder.append(s + ",");
+                                    break;
+                                }
+                            }
+                        }
+                        String completedString = builder.delete(builder.length() - 1, builder.length()).toString();
+                        list1.setTypeApplicable(completedString);
+                    } else {
+                        for (Map<String, String> map1 : typeApplicable) {
+                            if (map1.get("value").equals(list1.getTypeApplicable())) {
+                                list1.setTypeApplicable(map1.get("label"));
                                 break;
                             }
                         }
                     }
-                    String completedString = builder.delete(builder.length()-1,builder.length()).toString();
-                    list1.setTypeApplicable(completedString);
-                }else {
-                    for (Map<String, String> map1 : typeApplicable) {
-                        if (map1.get("value").equals(list1.getTypeApplicable())) {
-                            list1.setTypeApplicable(map1.get("label"));
-                            break;
-                        }
-                    }
                 }
-            }
-            //能源类型
-            List<Map<String, String>> nylx = (List<Map<String, String>>)map.get("NYLXCLASS");
-            for (LawsDto list1:data){
-                if (StringUtils.isNotBlank(list1.getNYLX()) && list1.getNYLX().contains(",")){
-                    String[] split = list1.getNYLX().split(",");
-                    StringBuilder builder = new StringBuilder();
-                    for (String s:split){
-                        for (Map<String,String> map1:nylx) {
-                            if (map1.get("value").equals(s)){
-                                s=map1.get("label");
-                                builder.append(s+",");
+                //能源类型
+                List<Map<String, String>> nylx = (List<Map<String, String>>) map.get("NYLXCLASS");
+                for (LawsDto list1 : data) {
+                    if (StringUtils.isNotBlank(list1.getNYLX()) && list1.getNYLX().contains(",")) {
+                        String[] split = list1.getNYLX().split(",");
+                        StringBuilder builder = new StringBuilder();
+                        for (String s : split) {
+                            for (Map<String, String> map1 : nylx) {
+                                if (map1.get("value").equals(s)) {
+                                    s = map1.get("label");
+                                    builder.append(s + ",");
+                                    break;
+                                }
+                            }
+                        }
+                        String completedString = builder.delete(builder.length() - 1, builder.length()).toString();
+                        list1.setNYLX(completedString);
+                    } else {
+                        for (Map<String, String> map1 : nylx) {
+                            if (map1.get("value").equals(list1.getNYLX())) {
+                                list1.setNYLX(map1.get("label"));
                                 break;
                             }
                         }
                     }
-                    String completedString = builder.delete(builder.length()-1,builder.length()).toString();
-                    list1.setNYLX(completedString);
-                }else {
-                    for (Map<String, String> map1 : nylx) {
-                        if (map1.get("value").equals(list1.getNYLX())) {
-                            list1.setNYLX(map1.get("label"));
-                            break;
-                        }
-                    }
                 }
-            }
-            //责任部门
-            List<Map<String, String>> zrbn = (List<Map<String, String>>)map.get("ZRBMCLASS");
-            for (LawsDto list1:data){
-                if (StringUtils.isNotBlank(list1.getZRBM()) && list1.getZRBM().contains(",")){
-                    String[] split = list1.getZRBM().split(",");
-                    StringBuilder builder = new StringBuilder();
-                    for (String s:split){
-                        for (Map<String,String> map1:zrbn) {
-                            if (map1.get("value").equals(s)){
-                                s=map1.get("label");
-                                builder.append(s+",");
+                //责任部门
+                List<Map<String, String>> zrbn = (List<Map<String, String>>) map.get("ZRBMCLASS");
+                for (LawsDto list1 : data) {
+                    if (StringUtils.isNotBlank(list1.getZRBM()) && list1.getZRBM().contains(",")) {
+                        String[] split = list1.getZRBM().split(",");
+                        StringBuilder builder = new StringBuilder();
+                        for (String s : split) {
+                            for (Map<String, String> map1 : zrbn) {
+                                if (map1.get("value").equals(s)) {
+                                    s = map1.get("label");
+                                    builder.append(s + ",");
+                                    break;
+                                }
+                            }
+                        }
+                        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())) {
+                                list1.setZRBM(map1.get("label"));
                                 break;
                             }
                         }
                     }
-                    try {
-                        String completedString = builder.delete(builder.length()-1,builder.length()).toString();
-                        list1.setZRBM(completedString);
-                    }catch (Exception e){
-                        System.out.println(e);
+                }
+                //产品线
+                List<Map<String, String>> sycpx = (List<Map<String, String>>) map.get("SYCPXCLASS");
+                for (LawsDto list1 : data) {
+                    if (list1.getSSRQ() != null) {
+                        list1.setSSRQ(list1.getSSRQ());
                     }
-                }else {
-                    for (Map<String, String> map1 : zrbn) {
-                        if (map1.get("value").equals(list1.getZRBM())) {
-                            list1.setZRBM(map1.get("label"));
-                            break;
-                        }
+                    if (list1.getZCCSSRQGJ() != null) {
+                        list1.setZCCSSRQGJ(list1.getZCCSSRQGJ());
+                    }
+                    if (list1.getXCXSSRQGJ() != null) {
+                        list1.setXCXSSRQGJ(list1.getXCXSSRQGJ());
                     }
-                }
-            }
-            //产品线
-            List<Map<String, String>> sycpx = (List<Map<String, String>>)map.get("SYCPXCLASS");
-            for (LawsDto list1:data){
-                if (list1.getSSRQ()!=null){
-                    list1.setSSRQ(list1.getSSRQ());
-                }
-                if (list1.getZCCSSRQGJ()!=null){
-                    list1.setZCCSSRQGJ(list1.getZCCSSRQGJ());
-                }
-                if (list1.getXCXSSRQGJ()!=null){
-                    list1.setXCXSSRQGJ(list1.getXCXSSRQGJ());
-                }
 
-                if (StringUtils.isNotBlank(list1.getSYCPX()) && list1.getSYCPX().contains(",")){
-                    String[] split = list1.getSYCPX().split(",");
-                    StringBuilder builder = new StringBuilder();
-                    for (String s:split){
-                        for (Map<String,String> map1:sycpx) {
-                            if (map1.get("value").equals(s)){
-                                s=map1.get("label");
-                                builder.append(s+",");
-                                break;
+                    if (StringUtils.isNotBlank(list1.getSYCPX()) && list1.getSYCPX().contains(",")) {
+                        String[] split = list1.getSYCPX().split(",");
+                        StringBuilder builder = new StringBuilder();
+                        for (String s : split) {
+                            for (Map<String, String> map1 : sycpx) {
+                                if (map1.get("value").equals(s)) {
+                                    s = map1.get("label");
+                                    builder.append(s + ",");
+                                    break;
+                                }
                             }
                         }
-                    }
-                    String completedString = builder.delete(builder.length()-1,builder.length()).toString();
-                    list1.setSYCPX(completedString);
-                }else {
-                    for (Map<String, String> map1 : sycpx) {
-                        if (map1.get("value").equals(list1.getSYCPX())) {
-                            list1.setSYCPX(map1.get("label"));
-                            break;
+                        String completedString = builder.delete(builder.length() - 1, builder.length()).toString();
+                        list1.setSYCPX(completedString);
+                    } else {
+                        for (Map<String, String> map1 : sycpx) {
+                            if (map1.get("value").equals(list1.getSYCPX())) {
+                                list1.setSYCPX(map1.get("label"));
+                                break;
+                            }
                         }
                     }
                 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/dao/TsPositionDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/dao/TsPositionDao.java
index 29e87b98..8f0f9f1d 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/dao/TsPositionDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/dao/TsPositionDao.java
@@ -5,6 +5,7 @@ import com.adc.da.slrs.sarRole.entity.TsRole;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -33,7 +34,7 @@ public interface TsPositionDao extends BaseMapper<TsPosition> {
      * @param roleId：角色ID
      */
     @Insert("insert into ts_position_role (position_id,role_id) values (#{positionId},#{roleId})")
-    void insertRole(String positionId, String roleId);
+    void insertRole(@Param("positionId") String positionId, @Param("roleId")String roleId);
 
     /**
      * 解绑角色
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 f2c1a0fc..23de453a 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
@@ -1935,17 +1935,14 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
 
 
         if (StringUtils.isNotEmpty(sarStandardsInfoEO.getMenuIds())) {
-
             for (String menuId : sarStandardsInfoEO.getMenuIds().split(",")) {
                 SarStandardsInfoEOPage standardsInfoEO = new SarStandardsInfoEOPage();
                 standardsInfoEO.setMenuId(menuId);
                 standardsInfoEO.setIdlist(new String[]{sarStandardsInfoEO.getId()});
-
-
                 try {
                     updateStandardsMenu(standardsInfoEO);
                 } catch (NullPointerException e) {
-                    updateStandInfo(standardsInfoEO);
+                    logger.error(e.getMessage(),e);
                 }
             }
         }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/controller/ZlTreeController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/controller/ZlTreeController.java
index 9012ed9d..f0170aa5 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/controller/ZlTreeController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/controller/ZlTreeController.java
@@ -6,7 +6,10 @@ import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
 import com.adc.da.slrs.zlTree.entity.TreeData;
 import com.adc.da.slrs.zlTree.entity.ZlTree;
+import com.adc.da.slrs.zlTree.entity.ZlTreeData;
+import com.adc.da.slrs.zlTree.service.IZlTreeDataService;
 import com.adc.da.slrs.zlTree.service.IZlTreeService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
@@ -33,6 +36,9 @@ public class ZlTreeController extends BaseController<ZlTree> {
     @Autowired
     IZlTreeService iZlTreeService;
 
+    @Autowired
+    IZlTreeDataService iZlTreeDataService;
+
     @PostMapping
     @ApiOperation("新增资料中心左侧树节点")
     public ResponseMessage addFileMaterial(@RequestBody ZlTree material){
@@ -46,8 +52,15 @@ public class ZlTreeController extends BaseController<ZlTree> {
     @ApiOperation("删除树节点")
     public ResponseMessage deleteMaterial(String id){
         List<String> idList = Arrays.asList(id.split(","));
-        boolean b = iZlTreeService.removeByIds(idList);
-        return Result.success(b);
+        QueryWrapper<ZlTreeData> wrapper=new QueryWrapper<>();
+        wrapper.in("id",idList);
+        List<ZlTreeData> data=iZlTreeDataService.list(wrapper);
+        if (null!=data && data.size()>0) {
+            return Result.error("节点下存在数据无法删除。");
+        }else {
+            boolean b = iZlTreeService.removeByIds(idList);
+            return Result.success(b);
+        }
 
     }
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/StandExportUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/StandExportUtil.java
index d9f16c12..3a9ae643 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/StandExportUtil.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/StandExportUtil.java
@@ -111,12 +111,12 @@ public class StandExportUtil {
                 boolean notBlank = StringUtils.isNotBlank(sarStandardsInfoEO.getIsRelateAccess());
                 if (notBlank) {
                     switch (sarStandardsInfoEO.getIsRelateAccess()){
-                        case "0": value="否"; break;
+                        case "2": value="否"; break;
                         case "1": value="是"; break;
                         default:value="";
                     }
                 }else {
-                    value = "";
+                    value = "否";
                 }
                 break;
             case "标准体系":
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml
index 9ecee506..1a7fb075 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml
@@ -94,7 +94,7 @@
         where sar_bussioness_stand.TEXT_STATUS_BUSS = '9z741h2m3j' AND sar_bussioness_stand.ISSUE_TIME IS NOT NULL and sar_bussioness_stand.VALID_FLAG = '0'
         <trim suffixOverrides="," >
             <if test="standCode != null and standCode != '' " >
-                and STAND_CODE like  concat(concat('%',#{standCode}),'%')
+                and (STAND_CODE like  concat(concat('%',#{standCode}),'%') or STAND_NAME like  concat(concat('%',#{standCode}),'%'))
             </if>
             <if test="reviewTimeStart != null and reviewTimeStart != '' and reviewTimeEnd != null and reviewTimeEnd != ''">
                 and DATE_FORMAT(sar_buss_stand_attr_info.FSRQBUSS, '%Y-%m-%d') between DATE_FORMAT(#{reviewTimeStart}, '%Y-%m-%d') AND DATE_FORMAT(#{reviewTimeEnd}, '%Y-%m-%d')
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml
index e64b06c1..390dadb8 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml
@@ -128,7 +128,7 @@
     </select>
 
     <select id="selectLawsByIdE" resultType="com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto">
-        SELECT a.ID, CONCAT(dicstandSort.DIC_TYPE_NAME," ", a.STAND_NUMBER, "-", a.STAND_YEAR) AS standNumber,a.STAND_NAME  as standName,a.STAND_EN_NAME,b.NYLX,b.SSRQ as SSRQ,b.XCXSSRQ as XCXSSRQGJ,b.ZCCSSRQ as ZCCSSRQGJ,
+        SELECT a.ID, CONCAT( a.STAND_SORT, " ", a.STAND_NUMBER,!IFNULL(a.STAND_YEAR,'-'),IFNULL(a.STAND_YEAR,'')) AS standNumber,a.STAND_NAME  as standName,a.STAND_EN_NAME,b.NYLX,b.SSRQ as SSRQ,b.XCXSSRQ as XCXSSRQGJ,b.ZCCSSRQ as ZCCSSRQGJ,
         b.ZRBM,b.SYCPX,b.CYCVPPSBM,b.CYCVPPSCN,b.KCCVPPSBM,b.KCCVPPSCN,b.CLLX as typeApplicable,dicstandSort.DIC_TYPE_NAME as standSortShow,
         a.STAND_YEAR as standYear,ISSUE_TIME as issueTime,a.STAND_TYPE as standType,a.TEXT_STATUS as textStatus
         FROM sar_standards_info a LEFT JOIN sar_stand_attr_info b on
diff --git a/doc/sql/20220706_新表.sql b/doc/sql/20220706_新表.sql
index b33648ad..137d8c6d 100644
--- a/doc/sql/20220706_新表.sql
+++ b/doc/sql/20220706_新表.sql
@@ -1,4 +1,4 @@
-CREATE TABLE `foton_slrs`.`Untitled`  (
+CREATE TABLE `foton_slrs`.`zl_data`  (
   `id` varchar(64) NULL COMMENT 'id',
   `data_id` varchar(64) NULL COMMENT '数据id'
 );
diff --git a/doc/sql/数据库改动.sql b/doc/sql/数据库改动.sql
index 24948330..b214ee22 100644
--- a/doc/sql/数据库改动.sql
+++ b/doc/sql/数据库改动.sql
@@ -7,3 +7,9 @@ INSERT INTO `foton_slrs`.`ts_dictype`(`ID`, `DIC_ID`, `DIC_TYPE_NAME`, `DIC_TYPE
 5.12------------------- 新增企标文本状态 发布、即将实施
 INSERT INTO `foton_slrs`.`ts_dictype` (`ID`, `DIC_ID`, `DIC_TYPE_NAME`, `DIC_TYPE_CODE`, `DESCRIBES`, `SHOW_INDEX`, `PARENT_ID`, `TREE_PID`, `OTHERS`, `CREATION_USER`, `VALID_FLAG`, `CREATION_TIME`, `MODIFY_TIME`) VALUES ('yxje11vu7hngvakm6xor', 'qybmpmpvykzpwy511xai', '发布', '6jnqba2mby', '', '7', NULL, NULL, NULL, 'chenchunmei', '0', '2022-05-12 01:45:21', '2022-05-12 01:45:21');
 INSERT INTO `foton_slrs`.`ts_dictype` (`ID`, `DIC_ID`, `DIC_TYPE_NAME`, `DIC_TYPE_CODE`, `DESCRIBES`, `SHOW_INDEX`, `PARENT_ID`, `TREE_PID`, `OTHERS`, `CREATION_USER`, `VALID_FLAG`, `CREATION_TIME`, `MODIFY_TIME`) VALUES ('n4wyayhkmbhc58wi21rs', 'qybmpmpvykzpwy511xai', '即将实施', 'rpvoxsvr60', '', '8', NULL, NULL, NULL, 'chenchunmei', '0', '2022-05-12 01:45:56', '2022-05-12 01:45:56');
+
+
+
+2022.07.19 ---- 模块结构单元变型号(乘用车) 模块结构单元名称(乘用车)
+INSERT INTO `foton_slrs`.`sar_stand_attr_details` (`ID`, `ATTR_FIELD`, `ATTR_NAME`, `ATTR_TYPE`, `ATTR_LEN`, `ORDER_NUM`, `IS_EDIT`, `CREATION_USER`, `VALID_FLAG`, `CREATION_TIME`, `MODIFY_TIME`, `IS_MUST`, `IS_SHOW_IMP`, `SHOW_REGION_ID`, `SEL_VAL`, `SAR_TYPE`, `IS_SEARCH`, `IS_WARN`, `IS_JANSUO`) VALUES ('gkwa6r4bfyjush9zbdyb1', 'CYCDYBXHBUSS', '模块结构单元变型号(乘用车)', 'INPUT_STR', '200', '18', '0', 'chenchunmei', '0', '2021-12-15 16:00:00', '2022-07-19 09:46:13', '1', '0', '2YVQYFS332W5XWAAY25F', '', 'BUSS', '1', '1', NULL);
+INSERT INTO `foton_slrs`.`sar_stand_attr_details` (`ID`, `ATTR_FIELD`, `ATTR_NAME`, `ATTR_TYPE`, `ATTR_LEN`, `ORDER_NUM`, `IS_EDIT`, `CREATION_USER`, `VALID_FLAG`, `CREATION_TIME`, `MODIFY_TIME`, `IS_MUST`, `IS_SHOW_IMP`, `SHOW_REGION_ID`, `SEL_VAL`, `SAR_TYPE`, `IS_SEARCH`, `IS_WARN`, `IS_JANSUO`) VALUES ('gkwa6r4bfyjush9zbdyb2', 'CYCDYMCBUSS', '模块结构单元名称(乘用车)', 'INPUT_STR', '200', '19', '0', 'chenchunmei', '0', '2021-12-15 16:00:00', '2022-07-19 09:46:13', '1', '0', '2YVQYFS332W5XWAAY25F', '', 'BUSS', '1', '1', NULL);