|
@@ -124,13 +124,13 @@ public class ProjectServiceImpl extends ServiceImpl<IProjectMapper, Project> imp
|
|
|
.selectAs(User::getUserName, ProjectVo::getProjectCreater)//别名
|
|
|
.leftJoin(ProjectTeam.class,ProjectTeam::getProjectId,Project::getProjectId)
|
|
|
.leftJoin(User.class, User::getUserId, ProjectTeam::getUserId)
|
|
|
- .eq(ProjectTeam::getIsCreater,1)
|
|
|
+
|
|
|
.orderByDesc(Project::getCreateTime);
|
|
|
|
|
|
boolean adminFlag=false;
|
|
|
|
|
|
FdkkResponse<FdkkManagerUserVo> manageUserInfo = fdKKClient.getManageUserInfo(token);
|
|
|
- if(manageUserInfo.getCode() != 0){
|
|
|
+ if(manageUserInfo.getCode() == 0){
|
|
|
if (ArrayUtil.isNotEmpty(manageUserInfo.getData().getRoleIds())){
|
|
|
if (manageUserInfo.getData().getRoleIds().contains(5)){
|
|
|
adminFlag = true;
|
|
@@ -140,6 +140,7 @@ public class ProjectServiceImpl extends ServiceImpl<IProjectMapper, Project> imp
|
|
|
|
|
|
if(!adminFlag){
|
|
|
wrapper.in(Project::getProjectId,projectIdSet);
|
|
|
+ wrapper.eq(ProjectTeam::getIsCreater,1);
|
|
|
}
|
|
|
|
|
|
if(StringUtils.isNotBlank(param.getProjectName())){
|