Merge remote-tracking branch 'origin/master'

fuliqi

2024-09-03 088bc1e162261a91a8779d8079bef9d6a5d6d3e9

 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)