@ -13,8 +13,8 @@ import jnpf.entity.Base_datainterfaceEntity;
@@ -13,8 +13,8 @@ import jnpf.entity.Base_datainterfaceEntity;
import jnpf.mapper.Base_datainterfaceMapper ;
import jnpf.model.base_datainterface.* ;
import jnpf.permission.model.authorize.AuthorizeConditionModel ;
import jnpf.permission.util.AuthorizeUtil ;
import jnpf.service.Base_datainterfaceService ;
import jnpf.service.CustomAuthService ;
import jnpf.util.* ;
import org.springframework.beans.factory.annotation.Autowired ;
import org.springframework.stereotype.Service ;
@ -41,7 +41,7 @@ public class Base_datainterfaceServiceImpl extends ServiceImpl<Base_datainterfac
@@ -41,7 +41,7 @@ public class Base_datainterfaceServiceImpl extends ServiceImpl<Base_datainterfac
private UserProvider userProvider ;
@Autowired
private AuthorizeUtil authorizeUtil ;
private CustomAuthService customAuthService ;
@Override
public List < Base_datainterfaceEntity > getList ( Base_datainterfacePagination base_datainterfacePagination ) {
@ -100,7 +100,7 @@ public class Base_datainterfaceServiceImpl extends ServiceImpl<Base_datainterfac
@@ -100,7 +100,7 @@ public class Base_datainterfaceServiceImpl extends ServiceImpl<Base_datainterfac
boolean isPc = ServletUtil . getHeader ( "jnpf-origin" ) . equals ( "pc" ) ;
if ( isPc & & pcPermission ) {
if ( ! userProvider . get ( ) . getIsAdministrator ( ) ) {
Object base_datainterfaceObj = authorizeUtil . getCondition ( new AuthorizeConditionModel ( base_datainterfaceQueryWrapper , base_datainterfacePagination . getMenuId ( ) , "base_datainterface" ) ) ;
Object base_datainterfaceObj = customAuthService . getCondition ( new AuthorizeConditionModel ( base_datainterfaceQueryWrapper , base_datainterfacePagination . getMenuId ( ) , "base_datainterface" ) ) ;
if ( ObjectUtil . isEmpty ( base_datainterfaceObj ) ) {
return new ArrayList < > ( ) ;
} else {
@ -113,7 +113,7 @@ public class Base_datainterfaceServiceImpl extends ServiceImpl<Base_datainterfac
@@ -113,7 +113,7 @@ public class Base_datainterfaceServiceImpl extends ServiceImpl<Base_datainterfac
}
if ( ! isPc & & appPermission ) {
if ( ! userProvider . get ( ) . getIsAdministrator ( ) ) {
Object base_datainterfaceObj = authorizeUtil . getCondition ( new AuthorizeConditionModel ( base_datainterfaceQueryWrapper , base_datainterfacePagination . getMenuId ( ) , "base_datainterface" ) ) ;
Object base_datainterfaceObj = customAuthService . getCondition ( new AuthorizeConditionModel ( base_datainterfaceQueryWrapper , base_datainterfacePagination . getMenuId ( ) , "base_datainterface" ) ) ;
if ( ObjectUtil . isEmpty ( base_datainterfaceObj ) ) {
return new ArrayList < > ( ) ;
} else {