diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/constans/MarketStandardConstants.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/constans/MarketStandardConstants.java
index cc069156..c2620bda 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/constans/MarketStandardConstants.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/constans/MarketStandardConstants.java
@@ -1,6 +1,7 @@
 package com.jero.modules.laws.marketStandard.constans;
 
 public class MarketStandardConstants {
+    private MarketStandardConstants(){}
 
     /**
      * 已发布
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java
index 9390cc0d..e10f71d9 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java
@@ -3,6 +3,7 @@ package com.jero.modules.laws.marketStandard.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.jero.common.api.vo.Result;
+import com.jero.common.api.vo.ResultCommon;
 import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.aspect.annotation.Translation;
 import com.jero.modules.laws.marketStandard.entity.LawsMarketStandard;
@@ -134,7 +135,7 @@ public class MarketStandardController {
     @RequiresPermissions("marketStandard:deleteBatch")
     public Result<?> delete(@RequestBody Map<String, String> map) {
         if (!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))) {
-            return Result.error("请选择数据!");
+            return Result.error(ResultCommon.SELECT_DATA);
         }
         return this.marketStandardService.deleteById(map.get("id"));
     }
@@ -152,10 +153,10 @@ public class MarketStandardController {
 //    @RequiresPermissions("marketStandard:deleteBatch")
     public Result<T> deleteBatch(@RequestBody Map<String, String> map) {
         if (!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))) {
-            return Result.error("请选择数据!");
+            return Result.error(ResultCommon.SELECT_DATA);
         }
         this.marketStandardService.deleteByIds(Arrays.asList(map.get("ids").split(",")));
-        return Result.OK("批量删除成功!");
+        return Result.OK(ResultCommon.OK);
     }
 
     /**
@@ -187,7 +188,7 @@ public class MarketStandardController {
     @RequiresPermissions("marketStandard:edit")
     public Result<T> edit(@RequestBody MarketStandardDetailVO marketStandardDetailVO) {
         this.marketStandardService.edit(marketStandardDetailVO);
-        return Result.OK("修改成功!");
+        return Result.OK(ResultCommon.OK);
     }
 
     /**
@@ -203,7 +204,7 @@ public class MarketStandardController {
     @RequiresPermissions("marketStandard:publish")
     public Result<?> publish(@RequestBody Map<String, String> map) {
         if (!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))) {
-            return Result.error("请选择数据!");
+            return Result.error(ResultCommon.SELECT_DATA);
         }
         return marketStandardService.checkPublish(map.get("id"));
     }
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardDetailController.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardDetailController.java
index f6cd2aef..c98e3f14 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardDetailController.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardDetailController.java
@@ -111,13 +111,15 @@ public class MarketStandardDetailController {
     @PostMapping(value = "/copy")
     @RequiresPermissions("marketStandard:detail:operate")
     public Result<?> copy(@RequestBody Map<String, String> map) {
-        if (!map.containsKey("newId") || StringUtils.isEmpty(map.get("newId"))) {
+        String newId = "newId";
+        String oldId = "oldId";
+        if (!map.containsKey(newId) || StringUtils.isEmpty(map.get(newId))) {
             return Result.error(ResultCommon.SELECT_DATA);
         }
-        if (!map.containsKey("oldId") || StringUtils.isEmpty(map.get("oldId"))) {
+        if (!map.containsKey(oldId) || StringUtils.isEmpty(map.get(oldId))) {
             return Result.error(ResultCommon.SELECT_DATA);
         }
-        return lawsMarketStandardDetailService.copy(map.get("oldId"),map.get("newId"));
+        return lawsMarketStandardDetailService.copy(map.get(oldId),map.get(newId));
     }
 
     /**
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandard.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandard.java
index c39306d1..a068baa8 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandard.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandard.java
@@ -1,19 +1,16 @@
 package com.jero.modules.laws.marketStandard.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jero.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecgframework.poi.excel.annotation.ExcelCollection;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
 /**
  * 市场法规
  * @TableName laws_market_standard
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/MarketStandardDetailVO.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/MarketStandardDetailVO.java
index dde3a646..2f529d5d 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/MarketStandardDetailVO.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/MarketStandardDetailVO.java
@@ -1,8 +1,6 @@
 package com.jero.modules.laws.marketStandard.entity;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiOperation;
 import lombok.Data;
 
 import java.util.List;
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/mapper/LawsMarketStandardDetailMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/mapper/LawsMarketStandardDetailMapper.java
index 2dacf92b..06a91e01 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/mapper/LawsMarketStandardDetailMapper.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/mapper/LawsMarketStandardDetailMapper.java
@@ -1,12 +1,11 @@
 package com.jero.modules.laws.marketStandard.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jero.modules.laws.marketStandard.entity.LawsMarketStandard;
 import com.jero.modules.laws.marketStandard.entity.LawsMarketStandardDetail;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardDetailService.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardDetailService.java
index 1b605824..b4f4559d 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardDetailService.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardDetailService.java
@@ -1,9 +1,8 @@
 package com.jero.modules.laws.marketStandard.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.jero.common.api.vo.Result;
 import com.jero.modules.laws.marketStandard.entity.LawsMarketStandardDetail;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.ModelAndView;
 
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardDetailServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardDetailServiceImpl.java
index 3fd8f7fd..771cb862 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardDetailServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardDetailServiceImpl.java
@@ -102,7 +102,7 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
             // 已发布的清单所有人都可以查看，未发布的数据只能作者和管理管查看、编辑、删除
             LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
             if(!Arrays.asList(sysUser.getRoleIds().split(",")).contains(lawsAdmin)
-                    && !Arrays.stream(sysUser.getRoleIds().split(",")).anyMatch(otherAdmin::contains)
+                    && Arrays.stream(sysUser.getRoleIds().split(",")).noneMatch(otherAdmin::contains)
                 && !Arrays.asList(sysUser.getRoleIds().split(",")).contains(superAdmin)
                 && !Objects.equals(lawsMarketStandard.getAuthor(),sysUser.getId())
                 && !Objects.equals(lawsMarketStandard.getManifestStatus(),
@@ -169,7 +169,7 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
         // 已发布的清单所有人都可以查看，未发布的数据只能作者和管理管查看、编辑、删除
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         if(!Arrays.asList(sysUser.getRoleIds().split(",")).contains(lawsAdmin)
-                && !Arrays.stream(sysUser.getRoleIds().split(",")).anyMatch(otherAdmin::contains)
+                && Arrays.stream(sysUser.getRoleIds().split(",")).noneMatch(otherAdmin::contains)
                 && !Arrays.asList(sysUser.getRoleIds().split(",")).contains(superAdmin)
                 && !Objects.equals(lawsMarketStandardOld.getAuthor(),sysUser.getId())){
             return Result.error(ResultCommon.NO_PERMISSION);
@@ -259,14 +259,18 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
                     }
                 }
             }
-            if(!StringUtils.isBlank(s.toString())){
-                m.append(MessageUtils.getMessage(ResultCommon.ROW_N_IMPORT,i + 4)).append(",")
-                        .append(s.toString(), 0, s.toString().length() - 1).append("<br>");
-            }
+            appenString(m, i, s);
         }
         return m;
     }
 
+    private void appenString(StringBuilder m, int i, StringBuilder s) {
+        if(!StringUtils.isBlank(s.toString())){
+            m.append(MessageUtils.getMessage(ResultCommon.ROW_N_IMPORT,i + 4)).append(",")
+                    .append(s.toString(), 0, s.toString().length() - 1).append("<br>");
+        }
+    }
+
     private void checkStandard(List<String> listStandardIds, List<String> listStandardIdRepeat,
                                LawsMarketStandardDetail p, StringBuilder s, Optional<LawsMarketStandardDetail> op) {
         if(!op.isPresent()){
@@ -286,11 +290,7 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
                 s.append(MessageUtils.getMessage(ResultCommon.FORMATTING_ERROR,name)).append(",");
             }
             // 验证标准英文名称
-            if(!Objects.equals(StringUtils.isEmpty(obj.getStandardEnglishName()) ? "" : obj.getStandardEnglishName(),
-                    StringUtils.isEmpty(p.getStandardEnglishName()) ? "" : p.getStandardEnglishName())){
-                String name = ValidUtil.getAnnotation(LawsMarketStandardDetail.class,"standardEnglishName");
-                s.append(MessageUtils.getMessage(ResultCommon.FORMATTING_ERROR,name)).append(",");
-            }
+            appendStandardEnglishName(p, s, obj);
             checkDate(p, s);
             // 验证类型
             if(!Objects.equals(obj.getType(),p.getType())){
@@ -301,6 +301,14 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
         listStandardIdRepeat.add(id);
     }
 
+    private void appendStandardEnglishName(LawsMarketStandardDetail p, StringBuilder s, LawsMarketStandardDetail obj) {
+        if(!Objects.equals(StringUtils.isEmpty(obj.getStandardEnglishName()) ? "" : obj.getStandardEnglishName(),
+                StringUtils.isEmpty(p.getStandardEnglishName()) ? "" : p.getStandardEnglishName())){
+            String name = ValidUtil.getAnnotation(LawsMarketStandardDetail.class,"standardEnglishName");
+            s.append(MessageUtils.getMessage(ResultCommon.FORMATTING_ERROR,name)).append(",");
+        }
+    }
+
     private void checkDate(LawsMarketStandardDetail p, StringBuilder s) {
         // 验证字典值是否满足条件
         StringBuilder dict = lawsCommonService.validateFieldByDict(p);
@@ -310,38 +318,26 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
         String format = "yyyy-MM-dd";
         // 新生产车实施日期
         if(!StringUtils.isEmpty(p.getNewProductImplDate())){
-            String[] str = p.getNewProductImplDate().split(",");
-            for (String s1 : str) {
-                if (!DateValidateUtil.isValidDate(s1, format)) {
-                    String name = ValidUtil.getAnnotation(LawsMarketStandardDetail.class,"newProductImplDate");
-                    s.append(MessageUtils.getMessage(ResultCommon.FORMATTING_ERROR,name))
-                            .append(",");
-                    break;
-                }
-            }
+            checkDate(s, format, p.getNewProductImplDate(), "newProductImplDate");
         }
         // 新认证车实施日期
         if(!StringUtils.isEmpty(p.getNewAuthImplDate())){
-            String[] str = p.getNewAuthImplDate().split(",");
-            for (String s1 : str) {
-                if (!DateValidateUtil.isValidDate(s1, format)) {
-                    String name = ValidUtil.getAnnotation(LawsMarketStandardDetail.class,"newAuthImplDate");
-                    s.append(MessageUtils.getMessage(ResultCommon.FORMATTING_ERROR,name))
-                            .append(",");
-                    break;
-                }
-            }
+            checkDate(s, format, p.getNewAuthImplDate(), "newAuthImplDate");
         }
         // 注册日期
         if(!StringUtils.isEmpty(p.getRegistrationDate())){
-            String[] str = p.getRegistrationDate().split(",");
-            for (String s1 : str) {
-                if (!DateValidateUtil.isValidDate(s1, format)) {
-                    String name = ValidUtil.getAnnotation(LawsMarketStandardDetail.class,"registrationDate");
-                    s.append(MessageUtils.getMessage(ResultCommon.FORMATTING_ERROR,name))
-                            .append(",");
-                    break;
-                }
+            checkDate(s, format, p.getRegistrationDate(), "registrationDate");
+        }
+    }
+
+    private void checkDate(StringBuilder s, String format, String newProductImplDate, String newProductImplDate2) {
+        String[] str = newProductImplDate.split(",");
+        for (String s1 : str) {
+            if (!DateValidateUtil.isValidDate(s1, format)) {
+                String name = ValidUtil.getAnnotation(LawsMarketStandardDetail.class, newProductImplDate2);
+                s.append(MessageUtils.getMessage(ResultCommon.FORMATTING_ERROR, name))
+                        .append(",");
+                break;
             }
         }
     }
@@ -432,7 +428,7 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
         // 已发布的清单所有人都可以查看，未发布的数据只能作者和管理管查看、编辑、删除
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         if(!Arrays.asList(sysUser.getRoleIds().split(",")).contains(lawsAdmin)
-                && !Arrays.stream(sysUser.getRoleIds().split(",")).anyMatch(otherAdmin::contains)
+                && Arrays.stream(sysUser.getRoleIds().split(",")).noneMatch(otherAdmin::contains)
                 && !Arrays.asList(sysUser.getRoleIds().split(",")).contains(superAdmin)
                 && !Objects.equals(lawsMarketStandard.getAuthor(),sysUser.getId())){
             return Result.error(ResultCommon.NO_PERMISSION);
@@ -469,7 +465,7 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
         }
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         if(!Arrays.asList(sysUser.getRoleIds().split(",")).contains(lawsAdmin)
-                && !Arrays.stream(sysUser.getRoleIds().split(",")).anyMatch(otherAdmin::contains)
+                && Arrays.stream(sysUser.getRoleIds().split(",")).noneMatch(otherAdmin::contains)
                 && !Arrays.asList(sysUser.getRoleIds().split(",")).contains(superAdmin)
                 && !Objects.equals(lawsMarketStandard.getAuthor(),sysUser.getId())){
             return Result.error(ResultCommon.NO_PERMISSION);
@@ -536,7 +532,7 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
         }
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         if(!Arrays.asList(sysUser.getRoleIds().split(",")).contains(lawsAdmin)
-                && !Arrays.stream(sysUser.getRoleIds().split(",")).anyMatch(otherAdmin::contains)
+                && Arrays.stream(sysUser.getRoleIds().split(",")).noneMatch(otherAdmin::contains)
                 && !Arrays.asList(sysUser.getRoleIds().split(",")).contains(superAdmin)
                 && !Objects.equals(lawsMarketStandard.getAuthor(),sysUser.getId())){
             return Result.error(ResultCommon.NO_PERMISSION);
@@ -610,7 +606,7 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
         queryLawsMarketStandardDetail.in(LawsMarketStandardDetail::getId, Arrays.asList(id.split(",")));
         long l = count(queryLawsMarketStandardDetail);
         if (l == 0 && !Arrays.asList(sysUser.getRoleIds().split(",")).contains(lawsAdmin)
-                && !Arrays.stream(sysUser.getRoleIds().split(",")).anyMatch(otherAdmin::contains)
+                && Arrays.stream(sysUser.getRoleIds().split(",")).noneMatch(otherAdmin::contains)
                 && !Arrays.asList(sysUser.getRoleIds().split(",")).contains(superAdmin)
                 && !Objects.equals(lawsMarketStandard.getAuthor(),sysUser.getId())) {
             throw new JeroBootException(ResultCommon.NO_PERMISSION);
@@ -653,7 +649,7 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
             // 已发布的清单所有人都可以查看，未发布的数据只能作者和管理管查看、编辑、删除
             LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
             if(!Arrays.asList(sysUser.getRoleIds().split(",")).contains(lawsAdmin)
-                    && !Arrays.stream(sysUser.getRoleIds().split(",")).anyMatch(otherAdmin::contains)
+                    && Arrays.stream(sysUser.getRoleIds().split(",")).noneMatch(otherAdmin::contains)
                     && !Arrays.asList(sysUser.getRoleIds().split(",")).contains(superAdmin)
                     && !Objects.equals(lawsMarketStandard.getAuthor(),sysUser.getId())
                     && !Objects.equals(lawsMarketStandard.getManifestStatus(),
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java
index 1bc5bef8..3c2f6097 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java
@@ -162,28 +162,14 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
                 }
             }
             String[] str = marketStandard.getCountry().split(",");
-            queryWrapper.and(i->{
-                for (int i1 = 0; i1 < str.length; i1++) {
-                    i.gt("find_in_set('" + str[i1] + "', ms.country)", 0);
-                    if(i1 != str.length - 1){
-                        i.or();
-                    }
-                }
-            });
+            queryWrapperCountry(queryWrapper, str);
         }
         if (StringUtils.isNotBlank(marketStandard.getManifestStatus())) {
             queryWrapper.in("ms.manifest_status",Arrays.asList(marketStandard.getManifestStatus().split(",")));
         }
         if (StringUtils.isNotBlank(marketStandard.getDrivePosition())) {
             String[] str = marketStandard.getDrivePosition().split(",");
-            queryWrapper.and(i->{
-                for (int i1 = 0; i1 < str.length; i1++) {
-                    i.gt("find_in_set('" + str[i1] + "', ms.drive_position)", 0);
-                    if(i1 != str.length - 1){
-                        i.or();
-                    }
-                }
-            });
+            queryWrapperDrivePosition(queryWrapper, str);
         }
         queryWrapper.like(StringUtils.isNotBlank(marketStandard.getAuthor()),
                 "CONCAT(u.realname, '(', u.username, ')')", marketStandard.getAuthor());
@@ -191,7 +177,7 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
         // 已发布的清单所有人都可以查看，未发布的数据只能作者和管理管查看、编辑、删除
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         if(!Arrays.asList(sysUser.getRoleIds().split(",")).contains(lawsAdmin)
-            && !Arrays.stream(sysUser.getRoleIds().split(",")).anyMatch(otherAdmin::contains)
+            && Arrays.stream(sysUser.getRoleIds().split(",")).noneMatch(otherAdmin::contains)
                 && !Arrays.asList(sysUser.getRoleIds().split(",")).contains(superAdmin)){
             queryWrapper.and(i->i.eq("ms.manifest_status",MarketStandardConstants.MANIFEST_STATUS_PUBLISH).or()
                     .eq("ms.author",sysUser.getId()));
@@ -199,15 +185,38 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
         return queryWrapper;
     }
 
+    private void queryWrapperDrivePosition(QueryWrapper<LawsMarketStandard> queryWrapper, String[] str) {
+        queryWrapper.and(i->{
+            for (int i1 = 0; i1 < str.length; i1++) {
+                i.gt("find_in_set('" + str[i1] + "', ms.drive_position)", 0);
+                if(i1 != str.length - 1){
+                    i.or();
+                }
+            }
+        });
+    }
+
+    private void queryWrapperCountry(QueryWrapper<LawsMarketStandard> queryWrapper, String[] str) {
+        queryWrapper.and(i->{
+            for (int i1 = 0; i1 < str.length; i1++) {
+                i.gt("find_in_set('" + str[i1] + "', ms.country)", 0);
+                if(i1 != str.length - 1){
+                    i.or();
+                }
+            }
+        });
+    }
+
     @Override
     @Transactional(rollbackFor = JeroBootException.class)
     public synchronized String add(MarketStandardDetailVO marketStandardDetailVO) {
         LawsMarketStandard manifest = marketStandardDetailVO.getManifest();
         manifest.setManifestStatus(MarketStandardConstants.MANIFEST_STATUS_NOT_PUBLISH);
         // 设置清单编号
+        String marketState = "market_state";
         manifest.setManifestNo(this.generateManifestNo(manifest.getManifestNo(),null));
-        Map<String, List<DictModel>> map = sysBaseAPI.translateManyDict("market_state",manifest.getCountry());
-        List<DictModel> listDict = map.get("market_state");
+        Map<String, List<DictModel>> map = sysBaseAPI.translateManyDict(marketState,manifest.getCountry());
+        List<DictModel> listDict = map.get(marketState);
         List<String> country = listDict.stream().map(DictModel::getText).collect(Collectors.toList());
         // 国家/地区+自定义+固定字段，自定义字段：预留手填，当前默认不填；固定字段：车型需满足标准法规清单
         manifest.setManifestName(String.join("",country) +
@@ -254,7 +263,7 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         // 已发布的清单所有人都可以查看，未发布的数据只能作者和管理管查看、编辑、删除
         if(!Arrays.asList(sysUser.getRoleIds().split(",")).contains(lawsAdmin)
-                && !Arrays.stream(sysUser.getRoleIds().split(",")).anyMatch(otherAdmin::contains)
+                && Arrays.stream(sysUser.getRoleIds().split(",")).noneMatch(otherAdmin::contains)
                 && !Arrays.asList(sysUser.getRoleIds().split(",")).contains(superAdmin)
                 && !Objects.equals(sysUser.getId(),lawsMarketStandardOld.getAuthor())){
             throw new JeroBootException(ResultCommon.NO_PERMISSION);
@@ -272,9 +281,10 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
             update.eq(LawsMarketStandard::getId,manifest.getId());
             update(update);
         }
+        String marketState = "market_state";
         manifest.setManifestNo(generateManifestNo(manifest.getManifestNo(),lawsMarketStandardOld.getManifestNo()));
-        Map<String, List<DictModel>> map = sysBaseAPI.translateManyDict("market_state",manifest.getCountry());
-        List<DictModel> listDict = map.get("market_state");
+        Map<String, List<DictModel>> map = sysBaseAPI.translateManyDict(marketState,manifest.getCountry());
+        List<DictModel> listDict = map.get(marketState);
         List<String> country = listDict.stream().map(DictModel::getText).collect(Collectors.toList());
         // 国家/地区+自定义+固定字段，自定义字段：预留手填，当前默认不填；固定字段：车型需满足标准法规清单
         manifest.setManifestName(String.join("",country) +
@@ -333,7 +343,7 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
         }else{
             // 状态未发布的数据只能作者和管理员查看、编辑、删除
             if(!Arrays.asList(sysUser.getRoleIds().split(",")).contains(lawsAdmin)
-                    && !Arrays.stream(sysUser.getRoleIds().split(",")).anyMatch(otherAdmin::contains)
+                    && Arrays.stream(sysUser.getRoleIds().split(",")).noneMatch(otherAdmin::contains)
                     && !Arrays.asList(sysUser.getRoleIds().split(",")).contains(superAdmin)
                     && !Objects.equals(sysUser.getId(),lawsMarketStandard.getAuthor())){
                 return Result.error(ResultCommon.NO_PERMISSION);
@@ -389,7 +399,7 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
         // 已发布的清单所有人都可以查看，未发布的数据只能作者和管理管查看、编辑、删除
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         if(!Arrays.asList(sysUser.getRoleIds().split(",")).contains(lawsAdmin)
-                && !Arrays.stream(sysUser.getRoleIds().split(",")).anyMatch(otherAdmin::contains)
+                && Arrays.stream(sysUser.getRoleIds().split(",")).noneMatch(otherAdmin::contains)
                 && !Arrays.asList(sysUser.getRoleIds().split(",")).contains(superAdmin)
                 && !Objects.equals(manifest.getAuthor(),sysUser.getId())
                 && !Objects.equals(manifest.getManifestStatus(),MarketStandardConstants.MANIFEST_STATUS_PUBLISH)){
@@ -458,7 +468,7 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
         // 已发布的清单所有人都可以查看，未发布的数据只能作者和管理管查看、编辑、删除
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         if(!Arrays.asList(sysUser.getRoleIds().split(",")).contains(lawsAdmin)
-                && !Arrays.stream(sysUser.getRoleIds().split(",")).anyMatch(otherAdmin::contains)
+                && Arrays.stream(sysUser.getRoleIds().split(",")).noneMatch(otherAdmin::contains)
                 && !Arrays.asList(sysUser.getRoleIds().split(",")).contains(superAdmin)
                 && !Objects.equals(lawsMarketStandardOld.getAuthor(),sysUser.getId())){
             return Result.error(ResultCommon.NO_PERMISSION);