Merge branch 'release' into 'master'

Release

See merge request !334

src/main/java/com/zhiwei/brandkbs2/service/impl/UserServiceImpl.java

@@ -191,6 +191,7 @@ public class UserServiceImpl implements UserService {
         roles.add(UserRole.createFromUserDto(userDTO));
         Update update = new Update();
         update.set("roles", roles);
+        update.set("submitter", nickname);
         userDao.updateOneByIdWithField(userDTO.getId(), update);
         return ResponseResult.success();
     }
@@ -204,6 +205,7 @@ public class UserServiceImpl implements UserService {
         List<UserRole> roles = user.getRoles().stream().filter(userRole -> !userRole.getProjectId().equals(pid)).collect(Collectors.toList());
         Update update = new Update();
         update.set("roles", roles);
+        update.set("submitter", UserThreadLocal.getNickname());
         userDao.updateOneByIdWithField(userId, update);
     }
 
@@ -247,13 +249,14 @@ public class UserServiceImpl implements UserService {
         User user = userDao.findOneById(userDTO.getId());
         // 老用户
         if (null != user) {
-            if (!user.isSuperAdmin()) {
-                Update update = new Update();
-                update.set("superAdmin", true);
-                update.set("roles", null);
-                userDao.updateOneByIdWithField(user.getId(), update);
+            if (user.isSuperAdmin()) {
                 return ResponseResult.success();
             }
+            Update update = new Update();
+            update.set("superAdmin", true);
+            update.set("submitter", nickname);
+            userDao.updateOneByIdWithField(user.getId(), update);
+            return ResponseResult.success();
         }
         // 新用户
         User newUser;