Merge branch 'feature' into 'dev'

Feature

See merge request !44

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

@@ -282,7 +282,7 @@ public class ProjectServiceImpl implements ProjectService {
             lists = new ArrayList<>();
             user.getRoles().forEach(userRole -> {
                 lists.add(projectDao.findOneById(userRole.getProjectId()));
-                roleExpired.put(userRole.getProjectId(), new Date(userRole.getExpiredTime()));
+                roleExpired.put(userRole.getProjectId(), null == userRole.getExpiredTime() ? null : new Date(userRole.getExpiredTime()));
             });
         }
         return lists.stream().filter(Project::isShow).map(project -> {

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

@@ -110,7 +110,7 @@ public class UserServiceImpl implements UserService {
 
     @Override
     public PageVO<JSONObject> findUserList(int page, int size, String keyword, String pid, int role) {
-        Criteria criteria = Criteria.where("superAdmin").is(false);
+        Criteria criteria = Criteria.where("roles.projectId").is(pid).and("superAdmin").is(false);
         if (-1 != role) {
             criteria = criteria.andOperator(Criteria.where("roles.key").is(Tools.concat(pid, role)));
 //            criteria = criteria.andOperator(Criteria.where("roles.roleId").is(role));