Merge branch 'feature' into 'release'

后台用户列表模块调整3

See merge request !335

src/main/java/com/zhiwei/brandkbs2/dao/impl/BaseMongoDaoImpl.java

@@ -172,7 +172,7 @@ public class BaseMongoDaoImpl<T extends AbstractBaseMongo> implements BaseMongoD
             return;
         }
         for (Map.Entry<String, Object> entry : JSONObject.parseObject(sorter).entrySet()) {
-            if (entry.getValue().toString().contains("desc")) {
+            if (null != entry.getValue() && entry.getValue().toString().contains("desc")) {
                 query.with(Sort.by(Sort.Order.desc(entry.getKey())));
             } else {
                 query.with(Sort.by(Sort.Order.asc(entry.getKey())));

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

@@ -437,6 +437,7 @@ public class UserServiceImpl implements UserService {
             result.put("username", user.getUsername());
             result.put("cTime", user.getCTime());
             result.put("phoneNumber", user.getPhoneNumber());
+            result.put("submitter", user.getSubmitter());
             Optional.ofNullable(user.getRoles()).flatMap(roles -> roles.stream().filter(ur -> {
                 if (null == pid) {
                     return true;