diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEngineeringServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEngineeringServiceImpl.java
index 3c3d4a8..1999637 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEngineeringServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEngineeringServiceImpl.java
@@ -20,6 +20,7 @@ import com.njcn.csdevice.service.CsEngineeringService;
 import com.njcn.redis.utils.RedisUtil;
 import com.njcn.system.api.AreaFeignClient;
 import com.njcn.system.pojo.po.Area;
+import com.njcn.web.utils.RequestUtil;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -106,9 +107,12 @@ public class CsEngineeringServiceImpl extends ServiceImpl<CsEngineeringMapper, C
     public List<CsEngineeringVO> queryEngineering(CsEngineeringQueryParm csEngineeringQueryParm) {
         List<CsEngineeringVO> csEngineeringVOList = new ArrayList<> ();
         QueryWrapper<CsEngineeringPO> queryWrapper = new QueryWrapper<> ();
-        if(StringUtils.isNotBlank (csEngineeringQueryParm.getUserId ())){
-            QueryWrapper<CsEngineeringUserPO> csEngineeringUserPOQueryWrapper = new QueryWrapper<> ();
-            csEngineeringUserPOQueryWrapper.lambda().eq(CsEngineeringUserPO::getUserId,csEngineeringQueryParm.getUserId ());
+
+        QueryWrapper<CsEngineeringUserPO> csEngineeringUserPOQueryWrapper = new QueryWrapper<> ();
+        //todo 后期修改
+        String userIndex = RequestUtil.getUserIndex();
+        if(RequestUtil.getUsername()!="root"){
+            csEngineeringUserPOQueryWrapper.lambda().eq(CsEngineeringUserPO::getUserId,userIndex);
             List<CsEngineeringUserPO> csEngineeringUserPOS = csEngineeringUserMapper.selectList(csEngineeringUserPOQueryWrapper);
             List<String> collect = csEngineeringUserPOS.stream().map(CsEngineeringUserPO::getEngineeringId).collect(Collectors.toList());
             if(CollectionUtil.isEmpty(collect)){
@@ -116,6 +120,8 @@ public class CsEngineeringServiceImpl extends ServiceImpl<CsEngineeringMapper, C
             }
             queryWrapper.in("id",collect);
         }
+
+
         queryWrapper.eq (StringUtils.isNotBlank (csEngineeringQueryParm.getProvince ()),"province",csEngineeringQueryParm.getProvince ()).
                 eq (StringUtils.isNotBlank (csEngineeringQueryParm.getCity ()),"city",csEngineeringQueryParm.getCity ()).
                 eq ("status","1" ).
@@ -138,9 +144,11 @@ public class CsEngineeringServiceImpl extends ServiceImpl<CsEngineeringMapper, C
         Page<CsEngineeringVO> returnPage = new Page<> (csEngineeringQueryPageParm.getPageNum ( ), csEngineeringQueryPageParm.getPageSize ( ));
 
         QueryWrapper<CsEngineeringPO> queryWrapper = new QueryWrapper<> ();
-        if(StringUtils.isNotBlank (csEngineeringQueryPageParm.getUserId ())){
-            QueryWrapper<CsEngineeringUserPO> csEngineeringUserPOQueryWrapper = new QueryWrapper<> ();
-            csEngineeringUserPOQueryWrapper.lambda().eq(CsEngineeringUserPO::getUserId,csEngineeringQueryPageParm.getUserId ());
+        QueryWrapper<CsEngineeringUserPO> csEngineeringUserPOQueryWrapper = new QueryWrapper<> ();
+        //todo 后期修改
+        String userIndex = RequestUtil.getUserIndex();
+        if(RequestUtil.getUsername()!="root"){
+            csEngineeringUserPOQueryWrapper.lambda().eq(CsEngineeringUserPO::getUserId,userIndex);
             List<CsEngineeringUserPO> csEngineeringUserPOS = csEngineeringUserMapper.selectList(csEngineeringUserPOQueryWrapper);
             List<String> collect = csEngineeringUserPOS.stream().map(CsEngineeringUserPO::getEngineeringId).collect(Collectors.toList());
             if(CollectionUtil.isEmpty(collect)){
@@ -148,6 +156,7 @@ public class CsEngineeringServiceImpl extends ServiceImpl<CsEngineeringMapper, C
             }
             queryWrapper.in("id",collect);
         }
+
         queryWrapper.eq (StringUtils.isNotBlank (csEngineeringQueryPageParm.getProvince ()),"province",csEngineeringQueryPageParm.getProvince ()).
                 eq (StringUtils.isNotBlank (csEngineeringQueryPageParm.getCity ()),"city",csEngineeringQueryPageParm.getCity ()).
                 eq ("status","1" ).