项目及人员部分修改

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

@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.zhiwei.brandkbs2.auth.UserThreadLocal;
 import com.zhiwei.brandkbs2.common.GenericAttribute;
 import com.zhiwei.brandkbs2.common.GlobalPojo;
-import com.zhiwei.brandkbs2.config.Constant;
 import com.zhiwei.brandkbs2.dao.ProjectDao;
 import com.zhiwei.brandkbs2.dao.UserDao;
 import com.zhiwei.brandkbs2.enmus.response.ProjectCodeEnum;
@@ -35,7 +34,6 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.net.URLEncoder;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -115,6 +113,7 @@ public class ProjectServiceImpl implements ProjectService {
         Query query = new Query();
         projectDao.addKeywordFuzz(query, keyword, "projectName");
         long count = projectDao.count(query);
+        projectDao.addSort(query, "{\"cTime\":\"descend\"}");
         mongoUtil.start(page, size, query);
         List<Project> projectList = projectDao.findList(query);
         List<JSONObject> resList = projectList.stream().map(project -> {

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

@@ -173,7 +173,12 @@ public class UserServiceImpl implements UserService {
         user.getRoles().stream().filter(userRoles -> userRoles.getProjectId().equals(userDTO.getProjectId())).findAny().ifPresent(userRole -> {
             // 更新原userRole
             userRole.setRoleId(userDTO.getRoleId());
-            OptionalLong.of(userDTO.getExpiredTime()).ifPresent(userRole::setExpiredTime);
+            // 权限用户以上则清空过期时间
+            if (userDTO.getRoleId() < RoleEnum.CUSTOMER.getState()) {
+                userRole.setExpiredTime(null);
+            } else {
+                OptionalLong.of(userDTO.getExpiredTime()).ifPresent(userRole::setExpiredTime);
+            }
             OptionalInt.of(userDTO.getExportAmount()).ifPresent(userRole::setExportAmount);
             userDao.updateOneByIdWithField(userDTO.getId(), new Update().set("roles", roles));
         });