diff --git a/tall/src/main/java/com/ccsens/tall/bean/vo/RoleVo.java b/tall/src/main/java/com/ccsens/tall/bean/vo/RoleVo.java index 28789dd6..65e081ae 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/vo/RoleVo.java +++ b/tall/src/main/java/com/ccsens/tall/bean/vo/RoleVo.java @@ -1,6 +1,5 @@ package com.ccsens.tall.bean.vo; -import com.sun.org.apache.xpath.internal.operations.Bool; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java b/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java index 7532d476..ef4c53b2 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java @@ -795,17 +795,17 @@ public class ProRoleService implements IProRoleService { List listAfter=proRoleDao.queryRoleShowslistBefore(param.getParam().getProjectId(),listBeforeId); for (int i = 0; i < listAfter.size(); i++) { //是否项目经理 - if(jili1.contains(listBefor.get(i).getId())){ - listBefor.get(i).setIsPM(true); + if(jili1.contains(listAfter.get(i).getId())){ + listAfter.get(i).setIsPM(true); }else { - listBefor.get(i).setIsPM(false); + listAfter.get(i).setIsPM(false); } //当前用户是否属于该角色 for (ProRole proRole : roleList) { - if (listBefor.get(i).getId().equals(proRole.getId())){ - listBefor.get(i).setMine(true); + if (listAfter.get(i).getId().equals(proRole.getId())){ + listAfter.get(i).setMine(true); }else{ - listBefor.get(i).setMine(false); + listAfter.get(i).setMine(false); } } }