diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DemandUserFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DemandUserFormDTO.java
index 56822cbe2c..59e16ce90a 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DemandUserFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DemandUserFormDTO.java
@@ -13,7 +13,7 @@ public class DemandUserFormDTO implements Serializable {
 //    public interface GridIdGroup extends CustomerClientShowGroup {
 //    }
 
-    @NotBlank(message = "工作人员所属组织id不能为空", groups = InternalGroup.class)
+    // @NotBlank(message = "工作人员所属组织id不能为空", groups = InternalGroup.class)
     private String agencyId;
 
 //    @NotBlank(message = "请先选择所属网格", groups = GridIdGroup.class)
@@ -21,5 +21,6 @@ public class DemandUserFormDTO implements Serializable {
 
 
     private String name;
-
+    private String userId;
+    private String customerId;
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
index 61d75723b7..1ab72df8b4 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
@@ -684,7 +684,9 @@ public class IcResiUserController implements ResultDataResolver {
      * 新增需求，需求人列表：展示当前工作人员所属组织+页面已选择所属网格 下的居民列
      */
     @PostMapping("demandusers")
-    public Result<List<DemandUserResDTO>> queryDemandUsers(@RequestBody DemandUserFormDTO formDTO) {
+    public Result<List<DemandUserResDTO>> queryDemandUsers(@LoginUser TokenDto tokenDto,@RequestBody DemandUserFormDTO formDTO) {
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setUserId(tokenDto.getUserId());
         ValidatorUtils.validateEntity(formDTO, DemandUserFormDTO.InternalGroup.class);
         return new Result<List<DemandUserResDTO>>().ok(icResiUserService.queryDemandUsers(formDTO));
     }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
index d8c1157794..854e7850bc 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
@@ -1158,6 +1158,14 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
 
     @Override
     public List<DemandUserResDTO> queryDemandUsers(DemandUserFormDTO formDTO) {
+        if (StringUtils.isBlank(formDTO.getAgencyId()) && StringUtils.isBlank(formDTO.getGridId())) {
+            // 默认查询当前工作人员所属组织下的居民
+            CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId());
+            if (null == staffInfo) {
+                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), String.format("未查询当前工作人员信息%s", formDTO.getUserId()));
+            }
+            formDTO.setAgencyId(staffInfo.getAgencyId());
+        }
         return baseDao.selectDemandUsers(formDTO.getAgencyId(), formDTO.getGridId(), formDTO.getName());
     }