Merge branch 'score_shop'

wzy

2022-10-12 4615437af0749766f519c10734e19360b0877ece

 zq-erp/src/main/java/com/matrix/system/common/tools/DataAuthUtil.java

@@ -20,7 +20,7 @@
     */
    public static boolean hasAllShopAuth() {
        SysUsers user = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
        return user.getShopRole().equals(Dictionary.FLAG_YES_Y) || user.getSuUserType().equals(AppConstance.USER_TYPE_ADMIN);
        return Dictionary.FLAG_YES_Y.equals(user.getShopRole()) || AppConstance.USER_TYPE_ADMIN.equals(user.getSuUserType());

    }

@@ -31,7 +31,7 @@
     */
    public static boolean hasAllCustomerAuth() {
        SysUsers user = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
        return user.getShopRole().equals(Dictionary.FLAG_YES_Y) || user.getSuUserType().equals(AppConstance.USER_TYPE_ADMIN);
        return Dictionary.FLAG_YES_Y.equals(user.getShopRole()) || AppConstance.USER_TYPE_ADMIN.equals(user.getSuUserType());

    }
}