Merge branch 'feature/xgh/bug/0527' into 'master'

Feature/xgh/bug/0527

See merge request !1791

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/role/HaobanRoleApiServiceImpl.java

@@ -307,19 +307,22 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService {
             String code = item.getMenuCode() ;
             // 开启的权限
             if(menuCodes.contains(code)) {
-                menuCodes.add(code) ;
                 continue ;
             }
             // 无需授权的权限
             if(0==item.getAuthControl() && StringUtils.isEmpty(item.getBtnCodeRel())) {
-                menuCodes.add(code) ;
+                if(!menuCodes.contains(code)) {
+                    menuCodes.add(code);
+                }
                 continue ;
             }
         }
         for(HaobanMenuBO item : allMenuList) {
             String code = item.getBtnCodeRel() ;
-            if(0==item.getAuthControl() && StringUtils.isNotEmpty(item.getBtnCodeRel()) && menuCodes.contains(code)) {
-                menuCodes.add(code) ;
+            if(0==item.getAuthControl() && StringUtils.isNotEmpty(code) && menuCodes.contains(code)) {
+                if(!menuCodes.contains(item.getMenuCode())) {
+                    menuCodes.add(item.getMenuCode());
+                }
                 continue ;
             }
         }