Merge branch 'developer' into 'master'

权限修复

See merge request !25

gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/MenuApiServiceImpl.java

@@ -54,7 +54,7 @@ public class MenuApiServiceImpl implements MenuApiService {
 
     private final Integer MENU_LEVEL = 2;
     private final Integer MENU_LEVEL_MAX = 5;
-    private final Integer DELIMITER = 5;
+    private final String DELIMITER = "-";
 
     @Autowired
     private MenuService menuService;
@@ -1459,12 +1459,12 @@ public class MenuApiServiceImpl implements MenuApiService {
                             List<GicPositionDTO> positionList = departMap.get(departmentCode);
                             if (CollectionUtils.isNotEmpty(positionList)) {
                                 positionList.forEach(e -> {
-                                    departPosition.add(departmentCode + "-" + e.getPositionCode());
+                                    departPosition.add(departmentCode + DELIMITER + e.getPositionCode());
                                 });
                             }
                         }
                     } else {
-                        departPosition.add(departmentCode + "-" + gicUserDTO.getPositionCode());
+                        departPosition.add(departmentCode + DELIMITER + gicUserDTO.getPositionCode());
                     }
                 }
                 //过滤运营人员的部门职位权限