Merge remote-tracking branch 'origin/master'

fuliqi

2024-09-04 0c2b1e149c6c0d9d9ec78bf4f871b3cea2cbfadc

 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)