diff --git a/src/main/java/com/xujie/sys/modules/base/controller/BaseController.java b/src/main/java/com/xujie/sys/modules/base/controller/BaseController.java
index 3d038375..d89995bf 100644
--- a/src/main/java/com/xujie/sys/modules/base/controller/BaseController.java
+++ b/src/main/java/com/xujie/sys/modules/base/controller/BaseController.java
@@ -2,6 +2,7 @@ package com.xujie.sys.modules.base.controller;
 
 import com.xujie.sys.common.utils.R;
 import com.xujie.sys.modules.base.data.BuData;
+import com.xujie.sys.modules.base.entity.RoleUserData;
 import com.xujie.sys.modules.base.service.BaseService;
 import com.xujie.sys.modules.factory.entity.vo.BusinessRoleVo;
 import com.xujie.sys.modules.oss.entity.SysOssEntity;
@@ -92,4 +93,11 @@ public class BaseController extends AbstractController {
         baseService.deleteProjectFile(inData);
         return R.ok();
     }
+
+    @PostMapping("/getRoleUserList")
+    @ResponseBody
+    public R getRoleUserList(@RequestBody RoleUserData inData){
+        List<RoleUserData> rows= baseService.getRoleUserList(inData);
+        return R.ok().put("rows",rows);
+    }
 }
diff --git a/src/main/java/com/xujie/sys/modules/base/dao/BaseMapper.java b/src/main/java/com/xujie/sys/modules/base/dao/BaseMapper.java
index 87ec2292..a35d1f43 100644
--- a/src/main/java/com/xujie/sys/modules/base/dao/BaseMapper.java
+++ b/src/main/java/com/xujie/sys/modules/base/dao/BaseMapper.java
@@ -1,6 +1,7 @@
 package com.xujie.sys.modules.base.dao;
 
 import com.xujie.sys.modules.base.data.BuData;
+import com.xujie.sys.modules.base.entity.RoleUserData;
 import com.xujie.sys.modules.factory.entity.vo.BusinessRoleVo;
 import com.xujie.sys.modules.pms.data.ProofDocumentData;
 import org.apache.ibatis.annotations.Mapper;
@@ -54,4 +55,6 @@ public interface BaseMapper {
     void updateProofDocument(ProofDocumentData proofDocumentData);
 
     void saveProofDocument(ProofDocumentData proofDocumentData);
+
+    List<RoleUserData> getRoleUserList(RoleUserData inData);
 }
diff --git a/src/main/java/com/xujie/sys/modules/base/entity/RoleUserData.java b/src/main/java/com/xujie/sys/modules/base/entity/RoleUserData.java
new file mode 100644
index 00000000..98fae711
--- /dev/null
+++ b/src/main/java/com/xujie/sys/modules/base/entity/RoleUserData.java
@@ -0,0 +1,15 @@
+package com.xujie.sys.modules.base.entity;
+
+import lombok.Data;
+import org.apache.ibatis.type.Alias;
+@Data
+@Alias("RoleUserData")
+public class RoleUserData {
+    private String userId;
+    private String roleId;
+    private String username;
+    private String WorkShopId;
+    private String WorkShopName;
+    private String roleName;
+    private String userDisplay;
+}
diff --git a/src/main/java/com/xujie/sys/modules/base/service/BaseService.java b/src/main/java/com/xujie/sys/modules/base/service/BaseService.java
index f56b6774..ab2ec26e 100644
--- a/src/main/java/com/xujie/sys/modules/base/service/BaseService.java
+++ b/src/main/java/com/xujie/sys/modules/base/service/BaseService.java
@@ -2,6 +2,7 @@ package com.xujie.sys.modules.base.service;
 
 
 import com.xujie.sys.modules.base.data.BuData;
+import com.xujie.sys.modules.base.entity.RoleUserData;
 import com.xujie.sys.modules.factory.entity.vo.BusinessRoleVo;
 import com.xujie.sys.modules.oss.entity.SysOssEntity;
 import com.xujie.sys.modules.pms.data.GetParamInData;
@@ -39,4 +40,9 @@ public interface BaseService {
     List<SysOssEntity> uploadProject(MultipartFile[] file, GetParamInData inData);
 
     void deleteProjectFile(SysOssEntity inData);
+
+
+    List<RoleUserData> getRoleUserList(RoleUserData inData);
+
+
 }
diff --git a/src/main/java/com/xujie/sys/modules/base/service/Impl/BaseServiceImpl.java b/src/main/java/com/xujie/sys/modules/base/service/Impl/BaseServiceImpl.java
index 87e61ca6..7d2c6e6b 100644
--- a/src/main/java/com/xujie/sys/modules/base/service/Impl/BaseServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/base/service/Impl/BaseServiceImpl.java
@@ -6,6 +6,7 @@ import com.xujie.sys.common.utils.DateUtils;
 import com.xujie.sys.common.utils.RandomUtil;
 import com.xujie.sys.modules.base.dao.BaseMapper;
 import com.xujie.sys.modules.base.data.BuData;
+import com.xujie.sys.modules.base.entity.RoleUserData;
 import com.xujie.sys.modules.base.service.BaseService;
 import com.xujie.sys.modules.factory.entity.vo.BusinessRoleVo;
 import com.xujie.sys.modules.oss.entity.SysOssEntity;
@@ -277,6 +278,11 @@ public class BaseServiceImpl implements BaseService {
         sysOssService.removeById(inData.getId());
     }
 
+    @Override
+    public List<RoleUserData> getRoleUserList(RoleUserData inData){
+        return baseMapper.getRoleUserList(inData);
+    }
+
     protected SysUserEntity getUser() {
         return (SysUserEntity) SecurityUtils.getSubject().getPrincipal();
     }
diff --git a/src/main/resources/mapper/base/BaseMapper.xml b/src/main/resources/mapper/base/BaseMapper.xml
index 61b8ec3d..3f51d2ca 100644
--- a/src/main/resources/mapper/base/BaseMapper.xml
+++ b/src/main/resources/mapper/base/BaseMapper.xml
@@ -67,4 +67,21 @@
         insert into plm_document_list_definition (site, proofing_id, document_type_id, project_id, manual_flag,create_date,created_by,test_part_id)
         values (#{orderRef1}, #{orderRef2}, #{documentTypeId}, #{orderRef4}, 'N',getdate(),#{createdBy},#{orderRef5})
     </insert>
+
+    <select id="getRoleUserList" resultType="RoleUserData">
+        select a.user_id,a.user_id,b.username,b.user_display,b.WorkShopId,c.workShopName
+        from sys_user_role a
+        left join sys_user b on a.user_id=b.user_id
+        left join eam_WorkShop c on b.workShopId=c.workShopId
+         <where>
+            and role_id=#{roleId}
+            <if test = "username != null and username != ''">
+                AND b.username LIKE '%' + #{username} + '%'
+            </if>
+            <if test = "userDisplay != null and userDisplay != ''">
+                AND b.user_display LIKE '%' + #{userDisplay} + '%'
+            </if>
+            and b.username is not null
+         </where>
+    </select>
 </mapper>
\ No newline at end of file