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

guoyujie

6 天以前 3d9e0ec1c1e457ed3fd2b334cf4c4dd66c10eead

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

@@ -38,15 +38,14 @@
                           on b.id = c.role_id
                 left join permission_basic d
                           on  d.id = c.permission_id
                           and d.permission='edit'
        where a.id = #{loginId}
        where a.id = #{loginId} and

        </if>
        <if test="userIsAdmin==true">
            from permission_basic d
            where d.permission='edit'
            where
        </if>
            and d.state = 1
             d.state = 1
        group by  d.id
    </select>