diff --git a/src/main/java/com/bonus/aqgqj/basis/entity/dto/ParamsDto.java b/src/main/java/com/bonus/aqgqj/basis/entity/dto/ParamsDto.java
index 42da916..a58ce39 100644
--- a/src/main/java/com/bonus/aqgqj/basis/entity/dto/ParamsDto.java
+++ b/src/main/java/com/bonus/aqgqj/basis/entity/dto/ParamsDto.java
@@ -62,11 +62,6 @@ public class ParamsDto extends PageEntity {
     /**
      * 班组ID
      */
-    private String teamId = UserUtil.getLoginUser() !=null && StringUtils.isNotBlank(UserUtil.getLoginUser().getTeamId()) ? UserUtil.getLoginUser().getTeamId() : "-1";
-
-    /**
-     * 是否是班组长
-     */
-    private String isTeamLeader = UserUtil.getLoginUser() !=null && StringUtils.isNotBlank(UserUtil.getLoginUser().getIsTeamLeader()) ? UserUtil.getLoginUser().getIsTeamLeader() : "0";
+    private String teamId = UserUtil.getLoginUser() !=null && StringUtils.isNotBlank(UserUtil.getLoginUser().getTeamId()) ? UserUtil.getLoginUser().getTeamId() : null;
 
 }
diff --git a/src/main/java/com/bonus/aqgqj/basis/entity/vo/ExperConfigVo.java b/src/main/java/com/bonus/aqgqj/basis/entity/vo/ExperConfigVo.java
index 1658133..6fd9029 100644
--- a/src/main/java/com/bonus/aqgqj/basis/entity/vo/ExperConfigVo.java
+++ b/src/main/java/com/bonus/aqgqj/basis/entity/vo/ExperConfigVo.java
@@ -93,6 +93,7 @@ public class ExperConfigVo {
     /**
      * 试验设备
      */
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     private List<ConfigDevVo> deviceVos;
 
     /**
diff --git a/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentStandardServiceImpl.java b/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentStandardServiceImpl.java
index 0966ead..b85b383 100644
--- a/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentStandardServiceImpl.java
+++ b/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentStandardServiceImpl.java
@@ -76,7 +76,7 @@ public class ExperimentStandardServiceImpl implements ExperimentStandardService
             if (experConfigVo == null) {
                 return ServerResponse.createByErrorMsg(HttpStatus.ERROR, "参数异常");
             }
-            // 试验设备、试验主要设备、试验依据、试验项校验
+            // 试验主要设备、试验依据、试验项校验
             String result2 = singleValidators(experConfigVo);
             if (StringUtils.isNotBlank(result2)) {
                 return ServerResponse.createByErrorMsg(HttpStatus.ERROR, result2);
@@ -88,11 +88,6 @@ public class ExperimentStandardServiceImpl implements ExperimentStandardService
             }
             // 添加试验依据
             mapper.addBasiss(experConfigVo.getBasisVos());
-            // 添加试验设备
-            for (ConfigDevVo deviceVo : experConfigVo.getDeviceVos()) {
-                deviceVo.setConfigId(experConfigVo.getId());
-            }
-            mapper.addDev(experConfigVo.getDeviceVos());
             // 添加试验主要设备
             for (ConfigMainDevVo mainDeviceVo : experConfigVo.getMainDeviceVos()) {
                 mainDeviceVo.setConfigId(experConfigVo.getId());
@@ -145,16 +140,15 @@ public class ExperimentStandardServiceImpl implements ExperimentStandardService
             if (experConfigVo == null) {
                 return ServerResponse.createByErrorMsg(HttpStatus.ERROR, "参数异常");
             }
-            // 试验设备、试验主要设备、试验依据、试验项校验
+            // 试验主要设备、试验依据、试验项校验
             String result2 = singleValidators(experConfigVo);
             if (StringUtils.isNotBlank(result2)) {
                 return ServerResponse.createByErrorMsg(HttpStatus.ERROR, result2);
             }
-            // 先删除试验依据、试验设备、试验主要设备、试验项、试验项内容后 在进行重新添加
+            // 先删除试验依据、试验主要设备、试验项、试验项内容后 在进行重新添加
             ParamsDto dto = new ParamsDto();
             dto.setId(experConfigVo.getId());
             mapper.delExperBasis(dto);
-            mapper.delConfigDev(dto);
             mapper.delConfigManDev(dto);
             List<ConfigItemsVo> configItemsVos = mapper.getConfigItems(dto.getId());
             mapper.delItems(configItemsVos);
@@ -166,10 +160,6 @@ public class ExperimentStandardServiceImpl implements ExperimentStandardService
             }
             // 添加试验依据
             mapper.addBasiss(experConfigVo.getBasisVos());
-            // 添加试验设备
-            for (ConfigDevVo deviceVo : experConfigVo.getDeviceVos()) {
-                deviceVo.setConfigId(experConfigVo.getId());
-            }
             mapper.addDev(experConfigVo.getDeviceVos());
             // 添加试验主要设备
             for (ConfigMainDevVo mainDeviceVo : experConfigVo.getMainDeviceVos()) {
@@ -206,9 +196,8 @@ public class ExperimentStandardServiceImpl implements ExperimentStandardService
         ExperConfigVo vo = null;
         try {
             vo = mapper.getExperConfig(data);
-            // 查询试验配置依据、试验设备、试验主要设备、试验项信息
+            // 查询试验配置依据、试验主要设备、试验项信息
             List<ExperBasisVo> basisVos= mapper.getExperBasis(vo.getId());
-           List<ConfigDevVo> deviceVos = mapper.getConfigDev(vo.getId());
            List<ConfigMainDevVo> mainDevVos = mapper.getConfigMainDev(vo.getId());
            List<ConfigItemsVo> configItemsVos = mapper.getConfigItems(vo.getId());
             for (ConfigItemsVo configItemsVo : configItemsVos) {
@@ -216,7 +205,6 @@ public class ExperimentStandardServiceImpl implements ExperimentStandardService
                 configItemsVo.setItemList(configItemVos);
             }
             vo.setBasisVos(basisVos);
-            vo.setDeviceVos(deviceVos);
             vo.setMainDeviceVos(mainDevVos);
             vo.setConfigItemsVos(configItemsVos);
             return ServerResponse.createSuccess(vo);
@@ -232,7 +220,6 @@ public class ExperimentStandardServiceImpl implements ExperimentStandardService
         try {
             mapper.delExperConfig(dto);
             mapper.delExperBasis(dto);
-            mapper.delConfigDev(dto);
             mapper.delConfigManDev(dto);
             List<ConfigItemsVo> configItemsVos = mapper.getConfigItems(dto.getId());
             mapper.delItems(configItemsVos);
@@ -316,7 +303,7 @@ public class ExperimentStandardServiceImpl implements ExperimentStandardService
     }
 
     /**
-     * 试验项、试验项内容、试验依据、试验设备、主要试验设备数据校验
+     * 试验项、试验项内容、试验依据、主要试验设备数据校验
      *
      * @param vo
      * @return String
@@ -324,16 +311,9 @@ public class ExperimentStandardServiceImpl implements ExperimentStandardService
      * @date 2024/7/18 19:17
      */
     public String singleValidators(ExperConfigVo vo) {
-        List<ConfigDevVo> deviceVos = vo.getDeviceVos();
         List<ConfigMainDevVo> mainDeviceVos = vo.getMainDeviceVos();
         List<ExperBasisVo> basisVos = vo.getBasisVos();
         List<ConfigItemsVo> configItemsVos = vo.getConfigItemsVos();
-        for (ConfigDevVo deviceVo : deviceVos) {
-            String validResult = validatorsUtils.valid(deviceVo, ConfigDevVo.Query.class);
-            if (StringUtils.isNotBlank(validResult)) {
-                return validResult;
-            }
-        }
         for (ConfigMainDevVo mainDeviceVo : mainDeviceVos) {
             String validResult = validatorsUtils.valid(mainDeviceVo, ConfigMainDevVo.Query.class);
             if (StringUtils.isNotBlank(validResult)) {
diff --git a/src/main/java/com/bonus/aqgqj/model/SysUser.java b/src/main/java/com/bonus/aqgqj/model/SysUser.java
index c6483b4..e797c9d 100644
--- a/src/main/java/com/bonus/aqgqj/model/SysUser.java
+++ b/src/main/java/com/bonus/aqgqj/model/SysUser.java
@@ -115,8 +115,6 @@ public class SysUser extends PageEntity {
 	private String roleCode;
 	/**班组ID*/
 	private String teamId;
-	/**是否是班组长*/
-	private String isTeamLeader;
 
 
 	public interface Status {
diff --git a/src/main/java/com/bonus/aqgqj/utils/SystemUtils.java b/src/main/java/com/bonus/aqgqj/utils/SystemUtils.java
index 5cff8a5..b932e76 100644
--- a/src/main/java/com/bonus/aqgqj/utils/SystemUtils.java
+++ b/src/main/java/com/bonus/aqgqj/utils/SystemUtils.java
@@ -68,7 +68,7 @@ public class SystemUtils {
     }
 
     /**
-     * 是否是试验班组-试验人员
+     * 是否是试验班组-班组成员
      * @return Boolean
      * @author cwchen
      * @date 2024/7/23 9:30
@@ -78,11 +78,8 @@ public class SystemUtils {
             return false;
         }
         String roleCode = StringUtils.isNotBlank(UserUtil.getLoginUser().getRoleCode()) ? UserUtil.getLoginUser().getRoleCode() : null;
-        String teamId = StringUtils.isNotBlank(UserUtil.getLoginUser().getTeamId()) ? UserUtil.getLoginUser().getTeamId() : "-1";
-        String isTeamLeader = StringUtils.isNotBlank(UserUtil.getLoginUser().getIsTeamLeader()) ? UserUtil.getLoginUser().getIsTeamLeader() : "0";
-        if(Objects.equals(Constants.EXPERIMENTALTEAM,roleCode)
-                && !Objects.equals(Constants.VALUE_DATA,teamId)
-                && Objects.equals(isTeamLeader,Constants.VALUE_DATA2)){
+        String teamId = StringUtils.isNotBlank(UserUtil.getLoginUser().getTeamId()) ? UserUtil.getLoginUser().getTeamId() : null;
+        if(Objects.equals(Constants.EXPERIMPERIMENTALTEAMMEMBER,roleCode)&& teamId!=null){
             return true;
         }else if(Objects.equals(Constants.ADMIDMINISTRATORS,roleCode) ){
             return true;
@@ -102,11 +99,8 @@ public class SystemUtils {
             return false;
         }
         String roleCode = StringUtils.isNotBlank(UserUtil.getLoginUser().getRoleCode()) ? UserUtil.getLoginUser().getRoleCode() : null;
-        String teamId = StringUtils.isNotBlank(UserUtil.getLoginUser().getTeamId()) ? UserUtil.getLoginUser().getTeamId() : "-1";
-        String isTeamLeader = StringUtils.isNotBlank(UserUtil.getLoginUser().getIsTeamLeader()) ? UserUtil.getLoginUser().getIsTeamLeader() : "0";
-        if(Objects.equals(Constants.EXPERIMENTALTEAM,roleCode)
-                && !Objects.equals(Constants.VALUE_DATA,teamId)
-                && Objects.equals(isTeamLeader,Constants.VALUE_DATA3)){
+        String teamId = StringUtils.isNotBlank(UserUtil.getLoginUser().getTeamId()) ? UserUtil.getLoginUser().getTeamId() : null;
+        if(Objects.equals(Constants.EXPERIMENTALTEAMLEADER,roleCode) && teamId!=null){
             return true;
         }else if(Objects.equals(Constants.ADMIDMINISTRATORS,roleCode) ){
             return true;
diff --git a/src/main/java/com/bonus/aqgqj/webResult/Constants.java b/src/main/java/com/bonus/aqgqj/webResult/Constants.java
index dc0c529..e4e2a67 100644
--- a/src/main/java/com/bonus/aqgqj/webResult/Constants.java
+++ b/src/main/java/com/bonus/aqgqj/webResult/Constants.java
@@ -146,14 +146,18 @@ public class Constants
 
     /**管理员*/
     public static final String ADMIDMINISTRATORS = "administrators";
-    /**技术负责人*/
+    /**技术负责人-审核权限*/
     public static final String TECHNICALDIRECTOR = "technicalDirector";
-    /**中心负责人*/
+    /**中心负责人-审批权限*/
     public static final String CENTERTRALMANAGER = "centerManager";
-    /**试验班组*/
-    public static final String EXPERIMENTALTEAM = "experimentalTeam";
-    /**综合班组*/
-    public static final String INTEGRATEDTEAM = "integratedTeam";
+    /**试验班组长-审阅权限*/
+    public static final String EXPERIMENTALTEAMLEADER = "experimentalTeamLeader";
+    /**综合班组长-收样、派工*/
+    public static final String INTEGRATEDTEAMLEADER = "integratedTeamLeader";
+    /**试验班组成员-试验填写/提交试验审阅*/
+    public static final String EXPERIMPERIMENTALTEAMMEMBER = "experimentalTeamMember";
+    /**综合班组成员-收样权限*/
+    public static final String INTEGRATEDTEAMMEMBER = "integratedTeamMember";
 
     public static final String VALUE_DATA = "-1";
     public static final String VALUE_DATA2 = "0";
diff --git a/src/main/resources/mappers/basis/ExamineMapper.xml b/src/main/resources/mappers/basis/ExamineMapper.xml
index 6350e57..888b817 100644
--- a/src/main/resources/mappers/basis/ExamineMapper.xml
+++ b/src/main/resources/mappers/basis/ExamineMapper.xml
@@ -61,12 +61,12 @@
             AND INSTR(tsd.sampleDevCode,#{devTypeCode})
         </if>
         /*管理员、技术负责人、中心负责人查询全部数据*/
-        <if test="roleCode != 'administrators' and roleCode != 'technicalDirector' and roleCode != 'centerManager' and roleCode == 'experimentalTeam'">
+        <if test="roleCode != 'administrators' and roleCode != 'technicalDirector' and roleCode != 'centerManager' and roleCode == 'experimentalTeamLeader'">
             /*试验班组-班组长审阅-只审阅本班组提交的审阅*/
-            <if test="teamId != '-1' and isTeamLeader == '1'">
+            <if test="teamId != null">
                 AND ts.team_id = #{teamId}
             </if>
-            <if test="and teamId != '-1' and isTeamLeader == '0'">
+            <if test="teamId ==null">
                 AND ts.team_id = -1
             </if>
         </if>
diff --git a/src/main/resources/mappers/basis/ExperimentalMapper.xml b/src/main/resources/mappers/basis/ExperimentalMapper.xml
index 9ef0d0c..1a29c7d 100644
--- a/src/main/resources/mappers/basis/ExperimentalMapper.xml
+++ b/src/main/resources/mappers/basis/ExperimentalMapper.xml
@@ -294,10 +294,10 @@
             AND INSTR(tsd.sampleDevCode,#{devTypeCode})
         </if>
         <if test="roleCode != 'administrators'">
-            <if test="roleCode == 'experimentalTeam' and teamId != '-1' and isTeamLeader == '0'">
+            <if test="roleCode == 'experimentalTeamMember' and teamId != null">
                 AND ts.team_id = #{teamId}
             </if>
-            <if test="(roleCode != 'experimentalTeam') or (roleCode == 'experimentalTeam' and teamId != '-1' and isTeamLeader == '1')">
+            <if test="(roleCode != 'experimentalTeamMember') or (roleCode == 'experimentalTeamMember' and teamId == null)">
                 AND ts.team_id = -1
             </if>
         </if>
@@ -490,7 +490,7 @@
         </foreach>
         AND del_flag = 0
         AND (
-            process_status IS NULL
+            (process_status IS NULL) OR
             (audti_status = 0 AND process_status = 1) OR
             (audti_status = 0 AND process_status = 2) OR
             (audti_status = 0 AND process_status = 3) OR
diff --git a/src/main/resources/mappers/system/UserMapper.xml b/src/main/resources/mappers/system/UserMapper.xml
index c32a8d7..e869c40 100644
--- a/src/main/resources/mappers/system/UserMapper.xml
+++ b/src/main/resources/mappers/system/UserMapper.xml
@@ -50,7 +50,7 @@
 	<select id="getUser" parameterType="String" resultType="com.bonus.aqgqj.model.SysUser">
 		select t.id,t.user_name as username,t.login_name as loginName,
 			   t.password,t.state,t.role_id as roleId,t.login_type loginType,t.new_user  newUser,
-				sr.role_code AS roleCode,sr.role_name AS roleName,t.team_id AS teamId,t.is_team_leader AS isTeamLeader
+				sr.role_code AS roleCode,sr.role_name AS roleName,t.team_id AS teamId
 		from sys_user t
 		LEFT JOIN sys_role sr ON t.role_id = sr.role_id AND sr.del_flag = 0
 		where t.login_name = #{username}