Merge branch 'feature-refactor' of ssh://10.10.100.21/source/platform-bi-server into feature-refactor

bi-server/src/main/java/com/usoftchina/bi/server/service/user/UserService.java

@@ -137,6 +137,8 @@ public class UserService {
      */
     public RepEntity updateUser(User user){
         userMapper.updateUser(user);
+        String updateUserName = userMapper.getUserById(user.getId()).getUserName();
+        messageLogService.update("用户管理", updateUserName, BaseContextHolder.getUserName(), "更新用户信息");
         return new RepEntity(RepCode.success);
     }
 
@@ -280,7 +282,7 @@ public class UserService {
                     content = "从用户组" + groupName + "删除用户：" + names;
                     result = "删除成功";
                 }
-                messageLog = new MessageLog(username, content,result, null, "用户管理", null);
+                messageLog = new MessageLog(username, content,result, null, "用户管理", groupName);
                 messageLogService.customizeLog(messageLog);
                 sb.delete(0, sb.length());
             }