diff --git a/laws-module-system/src/main/java/com/jero/modules/system/controller/SysGroupController.java b/laws-module-system/src/main/java/com/jero/modules/system/controller/SysGroupController.java
index a836a008..6bc4bd06 100644
--- a/laws-module-system/src/main/java/com/jero/modules/system/controller/SysGroupController.java
+++ b/laws-module-system/src/main/java/com/jero/modules/system/controller/SysGroupController.java
@@ -1,6 +1,7 @@
 package com.jero.modules.system.controller;
 
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.jero.common.api.vo.Result;
@@ -12,6 +13,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 
 
 /**
@@ -82,14 +84,23 @@ public class SysGroupController {
 
     /**
      * 分组管理-删除
-     * @param id
+     * @param jsonObject
      * @return
      */
 //    @RequiresPermissions("sys:group:edit")
-    @GetMapping("/delete")
+    @PostMapping("/delete")
     @ApiOperation(value = "分组管理-删除", notes = "分组管理-删除")
-    public Result<Object> delete(@RequestParam(name="id") String id) {
+    public Result<Object> delete(@RequestBody JSONObject jsonObject) {
+        String id = jsonObject.getString("id");
         return sysGroupService.delete(id);
     }
 
+    //    @RequiresPermissions("sys:group:list")
+    @GetMapping("/list")
+    @ApiOperation(value = "分组管理-列表查询", notes = "分组管理-列表查询")
+    public Result<Object> list() {
+        List<SysGroup> list = sysGroupService.list();
+        return Result.OK(list);
+    }
+
 }
diff --git a/laws-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/laws-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
index 1d5303b7..e0c13171 100644
--- a/laws-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
+++ b/laws-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
@@ -137,6 +137,7 @@ public class SysUserController {
 
         // 处理手机号和邮箱，进行对应加密
         Map<String, String[]> parameterMap = req.getParameterMap();
+        String groupId = req.getParameter("groupId");
         this.sysUserService.encryptReqMapData(parameterMap);
         user.setEmail(this.sysUserService.proceedEmailEncrypt(user.getEmail()));
         user.setPhone(this.sysUserService.proceedPhoneEncrypt(user.getPhone()));
@@ -154,7 +155,7 @@ public class SysUserController {
         }
         IPage<SysUser> pageList;
         try {
-            pageList = sysUserService.queryPage(page, subDepIds, roleId, queryWrapper);
+            pageList = sysUserService.queryPage(page, subDepIds, roleId, groupId, queryWrapper);
         }catch (Exception e){
             return Result.error(MessageUtils.getMessage(ResultCommon.ERROR));
         }
diff --git a/laws-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java b/laws-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java
index ffed2a81..43941f9e 100644
--- a/laws-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java
+++ b/laws-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java
@@ -251,6 +251,13 @@ public class SysUser implements Serializable {
     @TableField(exist = false)
     private String realnameOrUsername;
 
+    /**
+     * 分组的id
+     */
+    @ApiModelProperty(value = "分组的id")
+    @TableField(exist = false)
+    private String groupId;
+
     /**
      * 拼接真实姓名和工号形成唯一的用户信息可用户查看
      * 不能用get开头，否则会造成初始化queryWrapper的bug
diff --git a/laws-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java b/laws-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java
index c167de11..6f1c57ec 100644
--- a/laws-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java
+++ b/laws-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java
@@ -30,7 +30,8 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
 	 * 分页查询用户，可支持组织机构检索
 	 * @return
 	 */
-	IPage<SysUser> queryPage(Page<SysUser> page, @Param("departIds") List<String> subDepIds , @Param("roleId") String roleId , @Param(Constants.WRAPPER) Wrapper<SysUser> wrapper);
+	IPage<SysUser> queryPage(Page<SysUser> page, @Param("departIds") List<String> subDepIds , @Param("roleId") String roleId ,
+							 @Param("groupId") String groupId, @Param(Constants.WRAPPER) Wrapper<SysUser> wrapper);
 
 	/**
 	  * 通过用户账号查询用户信息
diff --git a/laws-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml b/laws-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml
index 703d7797..bc753250 100644
--- a/laws-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml
+++ b/laws-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml
@@ -12,6 +12,14 @@
 			</foreach>
 			)
 		</if>
+		<if test="groupId != null and groupId !=' '">
+			and id in (select user_id from sys_user_group where group_id = #{groupId}
+			)
+		</if>
+		<if test="roleId!=null and roleId!=''">
+			and id in (select user_id from sys_user_role where role_id = #{roleId}
+			)
+		</if>
 		<if test="roleId!=null and roleId!=''">
 			and id in (select user_id from sys_user_role where role_id = #{roleId}
 			)
diff --git a/laws-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java b/laws-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java
index c2115533..2451e04b 100644
--- a/laws-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java
+++ b/laws-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java
@@ -36,7 +36,7 @@ public interface ISysUserService extends IService<SysUser> {
 	 * @param queryWrapper
 	 * @return
 	 */
-	IPage<SysUser> queryPage(Page<SysUser> page, List<String> subDepIds, String roleId, QueryWrapper<SysUser> queryWrapper);
+	IPage<SysUser> queryPage(Page<SysUser> page, List<String> subDepIds, String roleId, String groupId, QueryWrapper<SysUser> queryWrapper);
 
 	/**
 	 * 重置密码
diff --git a/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java b/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java
index 55cbb135..fe1159b5 100644
--- a/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java
+++ b/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java
@@ -79,8 +79,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 	private ISysUserService sysUserService;
 
 	@Override
-	public IPage<SysUser> queryPage(Page<SysUser> page, List<String> subDepIds, String roleId, QueryWrapper<SysUser> queryWrapper){
-		IPage<SysUser> sysUserIPage = this.userMapper.queryPage(page, subDepIds, roleId, queryWrapper);
+	public IPage<SysUser> queryPage(Page<SysUser> page, List<String> subDepIds, String roleId, String groupId, QueryWrapper<SysUser> queryWrapper){
+		IPage<SysUser> sysUserIPage = this.userMapper.queryPage(page, subDepIds, roleId, groupId, queryWrapper);
 		sysUserIPage.getRecords().forEach(user -> {
 			// 对手机号、邮箱进行解密处理
 			proceedUserInfoDecrypt(user);