Merge remote-tracking branch 'origin/master'

fuliqi

2024-09-05 cd24a045bd9ee29505ddc9760d25f5d4037f4f0c

 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("zg_city")) {
                return null;
            }
            return getLoginUser().getUser().getUnitId();
        }
        catch (Exception e)