diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/controller/SysRoleController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/controller/SysRoleController.java
index d90e8d9..e6cb074 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/controller/SysRoleController.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/controller/SysRoleController.java
@@ -5,6 +5,8 @@ import java.util.List;
 import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
 
+import com.hxhq.business.domain.SystemLog;
+import com.hxhq.business.service.ISystemLogService;
 import com.hxhq.system.domain.SysUserRole;
 import com.hxhq.system.form.RoleUserSaveForm;
 import com.hxhq.system.service.ISysDeptService;
@@ -51,6 +53,9 @@ public class SysRoleController extends BaseController
     @Autowired
     private ISysDeptService deptService;
 
+    @Autowired
+    private ISystemLogService systemLogService;
+
     @RequiresPermissions("system:role:list")
     @GetMapping("/list")
     public TableDataInfo list(SysRole role)
@@ -239,14 +244,34 @@ public class SysRoleController extends BaseController
     @Transactional(rollbackFor = Exception.class)
     public AjaxResult setAll(@RequestBody RoleUserSaveForm form)
     {
+        SysRole sysRole = roleService.selectRoleById(form.getRoleId());
         List<Long> existsUserIds =  userService.selectAllocatedListSimple(form.getRoleId());
         List<Long> deleteIds = existsUserIds.stream().filter(o->!form.getUserIdList().contains(o)).collect(Collectors.toList());
         List<Long> addList = form.getUserIdList().stream().filter(o->!existsUserIds.contains(o)).collect(Collectors.toList());
+
+        List<String> deleteUserNames = new ArrayList<>();
+        List<String> addUserNames = new ArrayList<>();
         if(deleteIds.size()>0){
             roleService.deleteAuthUsers(form.getRoleId(), deleteIds.toArray(new Long[0]));
+            deleteUserNames = userService.selectNamesByIdList(deleteIds);
         }
         if(addList.size()>0){
             roleService.insertAuthUsers(form.getRoleId(), addList.toArray(new Long[0]));
+            addUserNames = userService.selectNamesByIdList(addList);
+        }
+
+        if(addUserNames.size()>0 || deleteUserNames.size()>0){
+            SystemLog log = new SystemLog();
+            log.setName(sysRole.getRoleName());
+            log.setJcmc("分配用户");
+            log.setJcmcEn("Add User");
+            log.setQmrId(SecurityUtils.getUserId());
+            log.setQmrMc(SecurityUtils.getNickName());
+            log.setQmrMcEn(SecurityUtils.getUsername());
+
+            log.setJcnr((addUserNames.size()>0?("新增用户："+String.join(",",addUserNames)):"")+(deleteUserNames.size()>0?("；删除用户："+String.join(",",deleteUserNames)):""));
+            log.setJcnrEn((addUserNames.size()>0?("Add User："+String.join(",",addUserNames)):"")+(deleteUserNames.size()>0?("；Remove User："+String.join(",",deleteUserNames)):""));
+            systemLogService.save(log);
         }
 
         return AjaxResult.success("操作成功");
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/mapper/SysUserMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/mapper/SysUserMapper.java
index f55e420..a4c8fde 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/mapper/SysUserMapper.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/mapper/SysUserMapper.java
@@ -187,4 +187,11 @@ public interface SysUserMapper
      * @return
      */
     List<BzListDto> selectBzList();
+
+    /**
+     * 根据用户id获取用户姓名
+     * @param idList
+     * @return
+     */
+    List<String> selectNamesByIdList(@Param("idList") List<Long> idList);
 }
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/ISysUserService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/ISysUserService.java
index 1607a14..1e692b6 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/ISysUserService.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/ISysUserService.java
@@ -269,4 +269,11 @@ public interface ISysUserService
      */
     List<BzListDto> selectBzList();
 
+    /**
+     * 根据id获取用户姓名
+     * @param idList
+     * @return
+     */
+    List<String> selectNamesByIdList(List<Long> idList);
+
 }
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/impl/SysUserServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/impl/SysUserServiceImpl.java
index 7ae5041..d8785eb 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/impl/SysUserServiceImpl.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/impl/SysUserServiceImpl.java
@@ -607,4 +607,9 @@ public class SysUserServiceImpl implements ISysUserService
     public List<BzListDto> selectBzList() {
         return userMapper.selectBzList();
     }
+
+    @Override
+    public List<String> selectNamesByIdList(List<Long> idList) {
+        return userMapper.selectNamesByIdList(idList);
+    }
 }
diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/system/SysUserMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/system/SysUserMapper.xml
index ccfb53e..fa5b895 100644
--- a/hxhq-modules/hxhq-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -340,5 +340,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		WHERE u.`del_flag`='0' AND r.`del_flag`='0' AND r.`role_key`='bz'
 	</select>
 
+	<select id="selectNamesByIdList" resultType="java.lang.String">
+		SELECT GROUP_CONCAT(nick_name) FROM `sys_user` WHERE user_id IN
+		<foreach collection="idList" item="id" open="(" separator="," close=")">
+			#{id}
+		</foreach>
+	</select>
+
 
 </mapper> 
\ No newline at end of file