Merge remote-tracking branch 'origin/master'

xiangpei

2024-09-03 d70a64df5d6f7b3b8f68436bd92df8366219981b

 ycl-server/src/main/java/com/ycl/utils/SecurityUtils.java

@@ -44,6 +44,11 @@
     * */
    public static Integer getUnitId() {
        try {
            if (isAdmin(getUserId())) {
                return null;
            } else if (hasRole("yw_admin")) {
                return null;
            }
            return getLoginUser().getUser().getUnitId();
        }
        catch (Exception e)