diff --git a/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupUserController.java b/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupUserController.java
index e4d0bcac..bfd95460 100644
--- a/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupUserController.java
+++ b/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupUserController.java
@@ -208,13 +208,11 @@ public class LawsWorkingGroupUserController extends JeroController<LawsWorkingGr
 	 @RequiresPermissions("sys:innerWorkingGroup:export")
 	 @AutoLog(value = "内部工作组人员关联表-导出")
 	 @ApiOperation(value="内部工作组人员关联表-导出", notes="内部工作组人员关联表-导出")
-	 @RequestMapping(value = "/export", method = RequestMethod.GET)
-	 public Result<?> template(@RequestBody LawsWorkingGroupUser lawsWorkingGroupUser, HttpServletResponse response) {
-		 String workingGroupId = lawsWorkingGroupUser.getWorkingGroupId();
-		 if (StringUtils.isBlank(workingGroupId)) {
-			 throw new JeroBootException(ResultCommon.PLEASE_SELECT_A_WORKGROUP_TO_EXPORT);
-		 }
-
+	 @GetMapping(value = "/export")
+	 public Result<?> template(@RequestParam(required = false) String workingGroupId, @RequestParam(required = false) String userName, @RequestParam(required = false) String userWorkNo, @RequestParam(required = false) String userRoleName, @RequestParam(required = false) String userPostName, HttpServletRequest request, HttpServletResponse response) {
+		if (StringUtils.isBlank(workingGroupId)){
+			throw new JeroBootException(ResultCommon.PLEASE_SELECT_A_WORKGROUP_TO_EXPORT);
+		}
 		 String outFileName = "内部工作组人员表" + System.currentTimeMillis() + ".xlsx";
 		 String ENCODING = "UTF-8";
 		 ExcelWriter writer = ExcelUtil.getWriter(true);
@@ -224,20 +222,21 @@ public class LawsWorkingGroupUserController extends JeroController<LawsWorkingGr
 
 		 //获取数据,分为三种情况：1、选中ID；2、没选ID且选了姓名、工号、角色、岗位四个筛选框；3、没选ID且没选四个筛选框
 		 List<LawsWorkingGroupUser> dos = null;
-		 String userName = lawsWorkingGroupUser.getUserName();
-		 String userWorkNo = lawsWorkingGroupUser.getUserWorkNo();
-		 String userRoleName = lawsWorkingGroupUser.getUserRoleName();
-		 String userPostName = lawsWorkingGroupUser.getUserPostName();
-		 if (StringUtils.isNotBlank(lawsWorkingGroupUser.getUserId())){
-			 dos = this.queryDataByUserId(lawsWorkingGroupUser.getUserId());
+		 //获取选中数据
+		 String selections = request.getParameter("selections");
+
+		 if (StringUtils.isNotBlank(selections)){
+			 dos = this.queryDataByUserId(selections);
 		 }
-		 if (StringUtils.isBlank(lawsWorkingGroupUser.getUserId()) && !StringUtils.isAllBlank(userName, userWorkNo, userRoleName, userPostName)){
-			 dos = this.queryDataByConditions(userName, userWorkNo, userRoleName, userPostName, lawsWorkingGroupUser.getWorkingGroupId());
+		 if (StringUtils.isBlank(selections) && !StringUtils.isAllBlank(userName, userWorkNo, userRoleName, userPostName)){
+			 dos = this.queryDataByConditions(userName, userWorkNo, userRoleName, userPostName, workingGroupId);
 		 }
-		 if (StringUtils.isBlank(lawsWorkingGroupUser.getUserId()) && StringUtils.isAllBlank(userName, userWorkNo, userRoleName, userPostName)){
-			 dos = this.queryDataByTree(lawsWorkingGroupUser.getWorkingGroupId());
+		 if (StringUtils.isBlank(selections) && StringUtils.isAllBlank(userName, userWorkNo, userRoleName, userPostName)){
+			 dos = this.queryDataByTree(workingGroupId);
 		 }
 
+		 lawsWorkingGroupUserService.userAssignment(dos);
+		 Collections.reverse(dos);
 		 //导出表头只保留别名中的字段
 		 writer.setOnlyAlias(true);
 		 //表格高度