|
@@ -34,6 +34,7 @@ import com.fdkankan.site.service.*;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.fdkankan.site.util.EscapeUtil;
|
|
|
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
|
|
+import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -52,6 +53,7 @@ import java.util.stream.Collectors;
|
|
|
* @since 2022-10-10
|
|
|
*/
|
|
|
@Service
|
|
|
+@Slf4j
|
|
|
public class ProjectServiceImpl extends ServiceImpl<IProjectMapper, Project> implements IProjectService {
|
|
|
|
|
|
@Autowired
|
|
@@ -130,6 +132,7 @@ public class ProjectServiceImpl extends ServiceImpl<IProjectMapper, Project> imp
|
|
|
boolean adminFlag=false;
|
|
|
|
|
|
FdkkResponse<FdkkManagerUserVo> manageUserInfo = fdKKClient.getManageUserInfo(token);
|
|
|
+ log.info("返回角色{}",manageUserInfo);
|
|
|
if(manageUserInfo.getCode() == 0){
|
|
|
if (ArrayUtil.isNotEmpty(manageUserInfo.getData().getRoleIds())){
|
|
|
if (manageUserInfo.getData().getRoleIds().contains(5)){
|
|
@@ -137,6 +140,7 @@ public class ProjectServiceImpl extends ServiceImpl<IProjectMapper, Project> imp
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ log.info("返回角色判断{}",adminFlag);
|
|
|
|
|
|
if(!adminFlag){
|
|
|
wrapper.in(Project::getProjectId,projectIdSet);
|