@ -95,83 +95,54 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
QueryWrapper < PaymentsoitemEntity > paymentsoitemQueryWrapper = new QueryWrapper < > ( ) ;
int arinvoices_item0soitemNum = 0 ;
QueryWrapper < Arinvoices_item0soitemEntity > arinvoices_item0soitemQueryWrapper = new QueryWrapper < > ( ) ;
boolean pcPermission = tru e;
boolean appPermission = tru e;
boolean pcPermission = fals e;
boolean appPermission = fals e;
boolean isPc = ServletUtil . getHeader ( "jnpf-origin" ) . equals ( "pc" ) ;
if ( isPc & & pcPermission ) {
if ( ! userProvider . get ( ) . getIsAdministrator ( ) ) {
< < < < < < < HEAD
Object saleorderObj = authorizeService . getCondition ( new AuthorizeConditionModel ( saleorderQueryWrapper , saleorderPagination . getMenuId ( ) , "jg_saleorder" ) ) ;
if ( ObjectUtil . isEmpty ( saleorderObj ) ) {
= = = = = = =
Object saleorderitemObj = authorizeService . getCondition ( new AuthorizeConditionModel ( saleorderitemQueryWrapper , saleorderitemPagination . getMenuId ( ) , "saleorderitem" ) ) ;
if ( ObjectUtil . isEmpty ( saleorderitemObj ) ) {
> > > > > > > 0 ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
return new ArrayList < > ( ) ;
} else {
saleorderitemQueryWrapper = ( QueryWrapper < SaleorderitemEntity > ) saleorderitemObj ;
saleorderitemNum + + ;
}
< < < < < < < HEAD
Object salesorder_item0Obj = authorizeService . getCondition ( new AuthorizeConditionModel ( salesorder_item0QueryWrapper , saleorderPagination . getMenuId ( ) , "jg_salesorder_item0" ) ) ;
= = = = = = =
Object salesorder_item0Obj = authorizeService . getCondition ( new AuthorizeConditionModel ( salesorder_item0QueryWrapper , saleorderitemPagination . getMenuId ( ) , "salesorder_item0" ) ) ;
> > > > > > > 0 ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
if ( ObjectUtil . isEmpty ( salesorder_item0Obj ) ) {
return new ArrayList < > ( ) ;
} else {
salesorder_item0QueryWrapper = ( QueryWrapper < Salesorder_item0Entity > ) salesorder_item0Obj ;
salesorder_item0Num + + ;
}
< < < < < < < HEAD
Object receiptoutsoitemObj = authorizeService . getCondition ( new AuthorizeConditionModel ( receiptoutsoitemQueryWrapper , saleorderPagination . getMenuId ( ) , "jg_receiptoutsoitem" ) ) ;
= = = = = = =
Object receiptoutsoitemObj = authorizeService . getCondition ( new AuthorizeConditionModel ( receiptoutsoitemQueryWrapper , saleorderitemPagination . getMenuId ( ) , "receiptoutsoitem" ) ) ;
> > > > > > > 0 ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
if ( ObjectUtil . isEmpty ( receiptoutsoitemObj ) ) {
return new ArrayList < > ( ) ;
} else {
receiptoutsoitemQueryWrapper = ( QueryWrapper < ReceiptoutsoitemEntity > ) receiptoutsoitemObj ;
receiptoutsoitemNum + + ;
}
< < < < < < < HEAD
Object collectionsoitemObj = authorizeService . getCondition ( new AuthorizeConditionModel ( collectionsoitemQueryWrapper , saleorderPagination . getMenuId ( ) , "jg_collectionsoitem" ) ) ;
= = = = = = =
Object collectionsoitemObj = authorizeService . getCondition ( new AuthorizeConditionModel ( collectionsoitemQueryWrapper , saleorderitemPagination . getMenuId ( ) , "collectionsoitem" ) ) ;
> > > > > > > 0 ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
if ( ObjectUtil . isEmpty ( collectionsoitemObj ) ) {
return new ArrayList < > ( ) ;
} else {
collectionsoitemQueryWrapper = ( QueryWrapper < CollectionsoitemEntity > ) collectionsoitemObj ;
collectionsoitemNum + + ;
}
< < < < < < < HEAD
Object salesbacksoitemObj = authorizeService . getCondition ( new AuthorizeConditionModel ( salesbacksoitemQueryWrapper , saleorderPagination . getMenuId ( ) , "jg_salesbacksoitem" ) ) ;
= = = = = = =
Object salesbacksoitemObj = authorizeService . getCondition ( new AuthorizeConditionModel ( salesbacksoitemQueryWrapper , saleorderitemPagination . getMenuId ( ) , "salesbacksoitem" ) ) ;
> > > > > > > 0 ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
if ( ObjectUtil . isEmpty ( salesbacksoitemObj ) ) {
return new ArrayList < > ( ) ;
} else {
salesbacksoitemQueryWrapper = ( QueryWrapper < SalesbacksoitemEntity > ) salesbacksoitemObj ;
salesbacksoitemNum + + ;
}
< < < < < < < HEAD
Object paymentsoitemObj = authorizeService . getCondition ( new AuthorizeConditionModel ( paymentsoitemQueryWrapper , saleorderPagination . getMenuId ( ) , "jg_paymentsoitem" ) ) ;
= = = = = = =
Object paymentsoitemObj = authorizeService . getCondition ( new AuthorizeConditionModel ( paymentsoitemQueryWrapper , saleorderitemPagination . getMenuId ( ) , "paymentsoitem" ) ) ;
> > > > > > > 0 ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
if ( ObjectUtil . isEmpty ( paymentsoitemObj ) ) {
return new ArrayList < > ( ) ;
} else {
paymentsoitemQueryWrapper = ( QueryWrapper < PaymentsoitemEntity > ) paymentsoitemObj ;
paymentsoitemNum + + ;
}
< < < < < < < HEAD
Object arinvoices_item0soitemObj = authorizeService . getCondition ( new AuthorizeConditionModel ( arinvoices_item0soitemQueryWrapper , saleorderPagination . getMenuId ( ) , "jg_arinvoices_item0soitem" ) ) ;
= = = = = = =
Object arinvoices_item0soitemObj = authorizeService . getCondition ( new AuthorizeConditionModel ( arinvoices_item0soitemQueryWrapper , saleorderitemPagination . getMenuId ( ) , "arinvoices_item0soitem" ) ) ;
> > > > > > > 0 ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
if ( ObjectUtil . isEmpty ( arinvoices_item0soitemObj ) ) {
return new ArrayList < > ( ) ;
} else {
@ -182,13 +153,8 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
}
if ( ! isPc & & appPermission ) {
if ( ! userProvider . get ( ) . getIsAdministrator ( ) ) {
< < < < < < < HEAD
Object saleorderObj = authorizeService . getCondition ( new AuthorizeConditionModel ( saleorderQueryWrapper , saleorderPagination . getMenuId ( ) , "jg_saleorder" ) ) ;
if ( ObjectUtil . isEmpty ( saleorderObj ) ) {
= = = = = = =
Object saleorderitemObj = authorizeService . getCondition ( new AuthorizeConditionModel ( saleorderitemQueryWrapper , saleorderitemPagination . getMenuId ( ) , "saleorderitem" ) ) ;
if ( ObjectUtil . isEmpty ( saleorderitemObj ) ) {
> > > > > > > 0 ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
return new ArrayList < > ( ) ;
} else {
saleorderitemQueryWrapper = ( QueryWrapper < SaleorderitemEntity > ) saleorderitemObj ;
@ -196,11 +162,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
}
< < < < < < < HEAD
Object salesorder_item0Obj = authorizeService . getCondition ( new AuthorizeConditionModel ( salesorder_item0QueryWrapper , saleorderPagination . getMenuId ( ) , "jg_salesorder_item0" ) ) ;
= = = = = = =
Object salesorder_item0Obj = authorizeService . getCondition ( new AuthorizeConditionModel ( salesorder_item0QueryWrapper , saleorderitemPagination . getMenuId ( ) , "salesorder_item0" ) ) ;
> > > > > > > 0 ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
if ( ObjectUtil . isEmpty ( salesorder_item0Obj ) ) {
return new ArrayList < > ( ) ;
} else {
@ -209,11 +171,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
}
< < < < < < < HEAD
Object receiptoutsoitemObj = authorizeService . getCondition ( new AuthorizeConditionModel ( receiptoutsoitemQueryWrapper , saleorderPagination . getMenuId ( ) , "jg_receiptoutsoitem" ) ) ;
= = = = = = =
Object receiptoutsoitemObj = authorizeService . getCondition ( new AuthorizeConditionModel ( receiptoutsoitemQueryWrapper , saleorderitemPagination . getMenuId ( ) , "receiptoutsoitem" ) ) ;
> > > > > > > 0 ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
if ( ObjectUtil . isEmpty ( receiptoutsoitemObj ) ) {
return new ArrayList < > ( ) ;
} else {
@ -222,11 +180,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
}
< < < < < < < HEAD
Object collectionsoitemObj = authorizeService . getCondition ( new AuthorizeConditionModel ( collectionsoitemQueryWrapper , saleorderPagination . getMenuId ( ) , "jg_collectionsoitem" ) ) ;
= = = = = = =
Object collectionsoitemObj = authorizeService . getCondition ( new AuthorizeConditionModel ( collectionsoitemQueryWrapper , saleorderitemPagination . getMenuId ( ) , "collectionsoitem" ) ) ;
> > > > > > > 0 ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
if ( ObjectUtil . isEmpty ( collectionsoitemObj ) ) {
return new ArrayList < > ( ) ;
} else {
@ -235,11 +189,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
}
< < < < < < < HEAD
Object salesbacksoitemObj = authorizeService . getCondition ( new AuthorizeConditionModel ( salesbacksoitemQueryWrapper , saleorderPagination . getMenuId ( ) , "jg_salesbacksoitem" ) ) ;
= = = = = = =
Object salesbacksoitemObj = authorizeService . getCondition ( new AuthorizeConditionModel ( salesbacksoitemQueryWrapper , saleorderitemPagination . getMenuId ( ) , "salesbacksoitem" ) ) ;
> > > > > > > 0 ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
if ( ObjectUtil . isEmpty ( salesbacksoitemObj ) ) {
return new ArrayList < > ( ) ;
} else {
@ -248,11 +198,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
}
< < < < < < < HEAD
Object paymentsoitemObj = authorizeService . getCondition ( new AuthorizeConditionModel ( paymentsoitemQueryWrapper , saleorderPagination . getMenuId ( ) , "jg_paymentsoitem" ) ) ;
= = = = = = =
Object paymentsoitemObj = authorizeService . getCondition ( new AuthorizeConditionModel ( paymentsoitemQueryWrapper , saleorderitemPagination . getMenuId ( ) , "paymentsoitem" ) ) ;
> > > > > > > 0 ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
if ( ObjectUtil . isEmpty ( paymentsoitemObj ) ) {
return new ArrayList < > ( ) ;
} else {
@ -261,11 +207,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
}
< < < < < < < HEAD
Object arinvoices_item0soitemObj = authorizeService . getCondition ( new AuthorizeConditionModel ( arinvoices_item0soitemQueryWrapper , saleorderPagination . getMenuId ( ) , "jg_arinvoices_item0soitem" ) ) ;
= = = = = = =
Object arinvoices_item0soitemObj = authorizeService . getCondition ( new AuthorizeConditionModel ( arinvoices_item0soitemQueryWrapper , saleorderitemPagination . getMenuId ( ) , "arinvoices_item0soitem" ) ) ;
> > > > > > > 0 ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
if ( ObjectUtil . isEmpty ( arinvoices_item0soitemObj ) ) {
return new ArrayList < > ( ) ;
} else {
@ -332,83 +274,54 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
QueryWrapper < PaymentsoitemEntity > paymentsoitemQueryWrapper = new QueryWrapper < > ( ) ;
int arinvoices_item0soitemNum = 0 ;
QueryWrapper < Arinvoices_item0soitemEntity > arinvoices_item0soitemQueryWrapper = new QueryWrapper < > ( ) ;
boolean pcPermission = tru e;
boolean appPermission = tru e;
boolean pcPermission = fals e;
boolean appPermission = fals e;
boolean isPc = ServletUtil . getHeader ( "jnpf-origin" ) . equals ( "pc" ) ;
if ( isPc & & pcPermission ) {
if ( ! userProvider . get ( ) . getIsAdministrator ( ) ) {
< < < < < < < HEAD
Object saleorderObj = authorizeService . getCondition ( new AuthorizeConditionModel ( saleorderQueryWrapper , saleorderPagination . getMenuId ( ) , "jg_saleorder" ) ) ;
if ( ObjectUtil . isEmpty ( saleorderObj ) ) {
= = = = = = =
Object saleorderitemObj = authorizeService . getCondition ( new AuthorizeConditionModel ( saleorderitemQueryWrapper , saleorderitemPagination . getMenuId ( ) , "saleorderitem" ) ) ;
if ( ObjectUtil . isEmpty ( saleorderitemObj ) ) {
> > > > > > > 0 ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
return new ArrayList < > ( ) ;
} else {
saleorderitemQueryWrapper = ( QueryWrapper < SaleorderitemEntity > ) saleorderitemObj ;
saleorderitemNum + + ;
}
< < < < < < < HEAD
Object salesorder_item0Obj = authorizeService . getCondition ( new AuthorizeConditionModel ( salesorder_item0QueryWrapper , saleorderPagination . getMenuId ( ) , "jg_salesorder_item0" ) ) ;
= = = = = = =
Object salesorder_item0Obj = authorizeService . getCondition ( new AuthorizeConditionModel ( salesorder_item0QueryWrapper , saleorderitemPagination . getMenuId ( ) , "salesorder_item0" ) ) ;
> > > > > > > 0 ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
if ( ObjectUtil . isEmpty ( salesorder_item0Obj ) ) {
return new ArrayList < > ( ) ;
} else {
salesorder_item0QueryWrapper = ( QueryWrapper < Salesorder_item0Entity > ) salesorder_item0Obj ;
salesorder_item0Num + + ;
}
< < < < < < < HEAD
Object receiptoutsoitemObj = authorizeService . getCondition ( new AuthorizeConditionModel ( receiptoutsoitemQueryWrapper , saleorderPagination . getMenuId ( ) , "jg_receiptoutsoitem" ) ) ;
= = = = = = =
Object receiptoutsoitemObj = authorizeService . getCondition ( new AuthorizeConditionModel ( receiptoutsoitemQueryWrapper , saleorderitemPagination . getMenuId ( ) , "receiptoutsoitem" ) ) ;
> > > > > > > 0 ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
if ( ObjectUtil . isEmpty ( receiptoutsoitemObj ) ) {
return new ArrayList < > ( ) ;
} else {
receiptoutsoitemQueryWrapper = ( QueryWrapper < ReceiptoutsoitemEntity > ) receiptoutsoitemObj ;
receiptoutsoitemNum + + ;
}
< < < < < < < HEAD
Object collectionsoitemObj = authorizeService . getCondition ( new AuthorizeConditionModel ( collectionsoitemQueryWrapper , saleorderPagination . getMenuId ( ) , "jg_collectionsoitem" ) ) ;
= = = = = = =
Object collectionsoitemObj = authorizeService . getCondition ( new AuthorizeConditionModel ( collectionsoitemQueryWrapper , saleorderitemPagination . getMenuId ( ) , "collectionsoitem" ) ) ;
> > > > > > > 0 ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
if ( ObjectUtil . isEmpty ( collectionsoitemObj ) ) {
return new ArrayList < > ( ) ;
} else {
collectionsoitemQueryWrapper = ( QueryWrapper < CollectionsoitemEntity > ) collectionsoitemObj ;
collectionsoitemNum + + ;
}
< < < < < < < HEAD
Object salesbacksoitemObj = authorizeService . getCondition ( new AuthorizeConditionModel ( salesbacksoitemQueryWrapper , saleorderPagination . getMenuId ( ) , "jg_salesbacksoitem" ) ) ;
= = = = = = =
Object salesbacksoitemObj = authorizeService . getCondition ( new AuthorizeConditionModel ( salesbacksoitemQueryWrapper , saleorderitemPagination . getMenuId ( ) , "salesbacksoitem" ) ) ;
> > > > > > > 0 ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
if ( ObjectUtil . isEmpty ( salesbacksoitemObj ) ) {
return new ArrayList < > ( ) ;
} else {
salesbacksoitemQueryWrapper = ( QueryWrapper < SalesbacksoitemEntity > ) salesbacksoitemObj ;
salesbacksoitemNum + + ;
}
< < < < < < < HEAD
Object paymentsoitemObj = authorizeService . getCondition ( new AuthorizeConditionModel ( paymentsoitemQueryWrapper , saleorderPagination . getMenuId ( ) , "jg_paymentsoitem" ) ) ;
= = = = = = =
Object paymentsoitemObj = authorizeService . getCondition ( new AuthorizeConditionModel ( paymentsoitemQueryWrapper , saleorderitemPagination . getMenuId ( ) , "paymentsoitem" ) ) ;
> > > > > > > 0 ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
if ( ObjectUtil . isEmpty ( paymentsoitemObj ) ) {
return new ArrayList < > ( ) ;
} else {
paymentsoitemQueryWrapper = ( QueryWrapper < PaymentsoitemEntity > ) paymentsoitemObj ;
paymentsoitemNum + + ;
}
< < < < < < < HEAD
Object arinvoices_item0soitemObj = authorizeService . getCondition ( new AuthorizeConditionModel ( arinvoices_item0soitemQueryWrapper , saleorderPagination . getMenuId ( ) , "jg_arinvoices_item0soitem" ) ) ;
= = = = = = =
Object arinvoices_item0soitemObj = authorizeService . getCondition ( new AuthorizeConditionModel ( arinvoices_item0soitemQueryWrapper , saleorderitemPagination . getMenuId ( ) , "arinvoices_item0soitem" ) ) ;
> > > > > > > 0 ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
if ( ObjectUtil . isEmpty ( arinvoices_item0soitemObj ) ) {
return new ArrayList < > ( ) ;
} else {
@ -419,13 +332,8 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
}
if ( ! isPc & & appPermission ) {
if ( ! userProvider . get ( ) . getIsAdministrator ( ) ) {
< < < < < < < HEAD
Object saleorderObj = authorizeService . getCondition ( new AuthorizeConditionModel ( saleorderQueryWrapper , saleorderPagination . getMenuId ( ) , "jg_saleorder" ) ) ;
if ( ObjectUtil . isEmpty ( saleorderObj ) ) {
= = = = = = =
Object saleorderitemObj = authorizeService . getCondition ( new AuthorizeConditionModel ( saleorderitemQueryWrapper , saleorderitemPagination . getMenuId ( ) , "saleorderitem" ) ) ;
if ( ObjectUtil . isEmpty ( saleorderitemObj ) ) {
> > > > > > > 0 ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
return new ArrayList < > ( ) ;
} else {
saleorderitemQueryWrapper = ( QueryWrapper < SaleorderitemEntity > ) saleorderitemObj ;
@ -433,11 +341,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
}
< < < < < < < HEAD
Object salesorder_item0Obj = authorizeService . getCondition ( new AuthorizeConditionModel ( salesorder_item0QueryWrapper , saleorderPagination . getMenuId ( ) , "jg_salesorder_item0" ) ) ;
= = = = = = =
Object salesorder_item0Obj = authorizeService . getCondition ( new AuthorizeConditionModel ( salesorder_item0QueryWrapper , saleorderitemPagination . getMenuId ( ) , "salesorder_item0" ) ) ;
> > > > > > > 0 ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
if ( ObjectUtil . isEmpty ( salesorder_item0Obj ) ) {
return new ArrayList < > ( ) ;
} else {
@ -446,11 +350,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
}
< < < < < < < HEAD
Object receiptoutsoitemObj = authorizeService . getCondition ( new AuthorizeConditionModel ( receiptoutsoitemQueryWrapper , saleorderPagination . getMenuId ( ) , "jg_receiptoutsoitem" ) ) ;
= = = = = = =
Object receiptoutsoitemObj = authorizeService . getCondition ( new AuthorizeConditionModel ( receiptoutsoitemQueryWrapper , saleorderitemPagination . getMenuId ( ) , "receiptoutsoitem" ) ) ;
> > > > > > > 0 ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
if ( ObjectUtil . isEmpty ( receiptoutsoitemObj ) ) {
return new ArrayList < > ( ) ;
} else {
@ -459,11 +359,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
}
< < < < < < < HEAD
Object collectionsoitemObj = authorizeService . getCondition ( new AuthorizeConditionModel ( collectionsoitemQueryWrapper , saleorderPagination . getMenuId ( ) , "jg_collectionsoitem" ) ) ;
= = = = = = =
Object collectionsoitemObj = authorizeService . getCondition ( new AuthorizeConditionModel ( collectionsoitemQueryWrapper , saleorderitemPagination . getMenuId ( ) , "collectionsoitem" ) ) ;
> > > > > > > 0 ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
if ( ObjectUtil . isEmpty ( collectionsoitemObj ) ) {
return new ArrayList < > ( ) ;
} else {
@ -472,11 +368,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
}
< < < < < < < HEAD
Object salesbacksoitemObj = authorizeService . getCondition ( new AuthorizeConditionModel ( salesbacksoitemQueryWrapper , saleorderPagination . getMenuId ( ) , "jg_salesbacksoitem" ) ) ;
= = = = = = =
Object salesbacksoitemObj = authorizeService . getCondition ( new AuthorizeConditionModel ( salesbacksoitemQueryWrapper , saleorderitemPagination . getMenuId ( ) , "salesbacksoitem" ) ) ;
> > > > > > > 0 ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
if ( ObjectUtil . isEmpty ( salesbacksoitemObj ) ) {
return new ArrayList < > ( ) ;
} else {
@ -485,11 +377,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
}
< < < < < < < HEAD
Object paymentsoitemObj = authorizeService . getCondition ( new AuthorizeConditionModel ( paymentsoitemQueryWrapper , saleorderPagination . getMenuId ( ) , "jg_paymentsoitem" ) ) ;
= = = = = = =
Object paymentsoitemObj = authorizeService . getCondition ( new AuthorizeConditionModel ( paymentsoitemQueryWrapper , saleorderitemPagination . getMenuId ( ) , "paymentsoitem" ) ) ;
> > > > > > > 0 ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
if ( ObjectUtil . isEmpty ( paymentsoitemObj ) ) {
return new ArrayList < > ( ) ;
} else {
@ -498,11 +386,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
}
< < < < < < < HEAD
Object arinvoices_item0soitemObj = authorizeService . getCondition ( new AuthorizeConditionModel ( arinvoices_item0soitemQueryWrapper , saleorderPagination . getMenuId ( ) , "jg_arinvoices_item0soitem" ) ) ;
= = = = = = =
Object arinvoices_item0soitemObj = authorizeService . getCondition ( new AuthorizeConditionModel ( arinvoices_item0soitemQueryWrapper , saleorderitemPagination . getMenuId ( ) , "arinvoices_item0soitem" ) ) ;
> > > > > > > 0 ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
if ( ObjectUtil . isEmpty ( arinvoices_item0soitemObj ) ) {
return new ArrayList < > ( ) ;
} else {