|
@@ -110,12 +110,12 @@ public class DatametaService extends BaseService {
|
|
|
boolean flag_bmsh_role = false;
|
|
|
boolean flag_zgbmsh_role = false;
|
|
|
for (Role role : serRole) {
|
|
|
- if(admin_id.equals(role.getRoleId()))
|
|
|
+ if(admin_id.equals(role.getRoleId())&&!"3".equals(dto.getDescription()))
|
|
|
flag = true;
|
|
|
- if(bmsh_role.equals(role.getRoleId())){
|
|
|
+ if(bmsh_role.equals(role.getRoleId())&&!"3".equals(dto.getDescription())){
|
|
|
flag_bmsh_role=true;
|
|
|
}
|
|
|
- if(zgbmsh_role.equals(role.getRoleId())){
|
|
|
+ if(zgbmsh_role.equals(role.getRoleId())&&!"3".equals(dto.getDescription())){
|
|
|
flag_zgbmsh_role=true;
|
|
|
}
|
|
|
}
|
|
@@ -158,7 +158,7 @@ public class DatametaService extends BaseService {
|
|
|
Predicate[] statList1 = new Predicate[2];
|
|
|
if(flag_bmsh_role) {
|
|
|
In<Object> in = cb.in(root.get("creatorOrg"));
|
|
|
- String []strArgs=dto.getCreatorOrg().split(";");
|
|
|
+ String []strArgs=dto.getCreatorOrg().split(",");
|
|
|
Boolean exist=false;
|
|
|
//获取当前用户所处机构
|
|
|
for (String st : strArgs) {
|