Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyujie

2025-09-01 a7d5b34a0fa720e5fd3dce1975e9dee94774a78e

 north-glass-erp/src/main/resources/mapper/userInfo/PermissionRoleMapper.xml

@@ -28,7 +28,7 @@
                    if(d.page=null || d.page='','',concat(d.page, '.')),
                    d.permission
                ) as 'permission'
        <if test="loginId!=1">
        <if test="userIsAdmin==false">
        from user as a
                 left join user_role as e
                           on e.user_id = a.id
@@ -42,7 +42,7 @@
        where a.id = #{loginId}

        </if>
        <if test="loginId==1">
        <if test="userIsAdmin==true">
            from permission_basic d
            where d.permission='edit'
        </if>