Browse Source

4.21

recovery
ma 4 years ago
parent
commit
26b3b738d0
  1. 1
      tall/src/main/java/com/ccsens/tall/bean/vo/RoleVo.java
  2. 12
      tall/src/main/java/com/ccsens/tall/service/ProRoleService.java

1
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;

12
tall/src/main/java/com/ccsens/tall/service/ProRoleService.java

@ -795,17 +795,17 @@ public class ProRoleService implements IProRoleService {
List<RoleVo.JueSeByProId> 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);
}
}
}

Loading…
Cancel
Save