Browse Source

更新设置当前企业角色方法

hejq 7 years ago
parent
commit
c272065ab1

+ 8 - 1
src/main/java/com/uas/platform/b2b/v2/service/impl/EnterpriseServiceImpl.java

@@ -25,6 +25,7 @@ import org.springframework.util.StringUtils;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 
 /**
@@ -144,7 +145,13 @@ public class EnterpriseServiceImpl implements EnterpriseService {
         // 设置为本企业管理员
         List<Role> adminList = roleDao.findByEnUUAndDesc(enterprise.getUu(), "管理员");
         if (!CollectionUtils.isEmpty(adminList)) {
-            if (!existRoles.contains(adminList.get(0))) {
+            final boolean[] exist = {false};
+            existRoles.forEach(role -> {
+                if (Objects.equals(role.getId(), adminList.get(0).getId())) {
+                    exist[0] = true;
+                }
+            });
+            if (!exist[0]) {
                 existRoles.add(adminList.get(0));
                 user.setRoles(existRoles);
             }