权限修改

product
bawei 2 years ago
parent 4cf5729eab
commit ee2aaf5f56

@ -56,8 +56,8 @@ public class Jg_naturalServiceImpl extends ServiceImpl<Jg_naturalMapper, Jg_natu
int total=0; int total=0;
int jg_naturalNum =0; int jg_naturalNum =0;
QueryWrapper<Jg_naturalEntity> jg_naturalQueryWrapper=new QueryWrapper<>(); QueryWrapper<Jg_naturalEntity> jg_naturalQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false; boolean pcPermission = true;
boolean appPermission = false; boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){ if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
@ -133,8 +133,8 @@ public class Jg_naturalServiceImpl extends ServiceImpl<Jg_naturalMapper, Jg_natu
int total=0; int total=0;
int jg_naturalNum =0; int jg_naturalNum =0;
QueryWrapper<Jg_naturalEntity> jg_naturalQueryWrapper=new QueryWrapper<>(); QueryWrapper<Jg_naturalEntity> jg_naturalQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false; boolean pcPermission = true;
boolean appPermission = false; boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){ if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){

@ -61,12 +61,12 @@ public class AreasettingServiceImpl extends ServiceImpl<AreasettingMapper, Areas
int total=0; int total=0;
int areasettingNum =0; int areasettingNum =0;
QueryWrapper<AreasettingEntity> areasettingQueryWrapper=new QueryWrapper<>(); QueryWrapper<AreasettingEntity> areasettingQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false; boolean pcPermission = true;
boolean appPermission = false; boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){ if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object areasettingObj=authorizeService.getCondition(new AuthorizeConditionModel(areasettingQueryWrapper,areasettingPagination.getMenuId(),"areasetting")); Object areasettingObj=authorizeService.getCondition(new AuthorizeConditionModel(areasettingQueryWrapper,areasettingPagination.getMenuId(),"jg_areasetting"));
if (ObjectUtil.isEmpty(areasettingObj)){ if (ObjectUtil.isEmpty(areasettingObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -77,7 +77,7 @@ public class AreasettingServiceImpl extends ServiceImpl<AreasettingMapper, Areas
} }
if(!isPc && appPermission){ if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object areasettingObj=authorizeService.getCondition(new AuthorizeConditionModel(areasettingQueryWrapper,areasettingPagination.getMenuId(),"areasetting")); Object areasettingObj=authorizeService.getCondition(new AuthorizeConditionModel(areasettingQueryWrapper,areasettingPagination.getMenuId(),"jg_areasetting"));
if (ObjectUtil.isEmpty(areasettingObj)){ if (ObjectUtil.isEmpty(areasettingObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -127,12 +127,12 @@ public class AreasettingServiceImpl extends ServiceImpl<AreasettingMapper, Areas
int total=0; int total=0;
int areasettingNum =0; int areasettingNum =0;
QueryWrapper<AreasettingEntity> areasettingQueryWrapper=new QueryWrapper<>(); QueryWrapper<AreasettingEntity> areasettingQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false; boolean pcPermission = true;
boolean appPermission = false; boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){ if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object areasettingObj=authorizeService.getCondition(new AuthorizeConditionModel(areasettingQueryWrapper,areasettingPagination.getMenuId(),"areasetting")); Object areasettingObj=authorizeService.getCondition(new AuthorizeConditionModel(areasettingQueryWrapper,areasettingPagination.getMenuId(),"jg_areasetting"));
if (ObjectUtil.isEmpty(areasettingObj)){ if (ObjectUtil.isEmpty(areasettingObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -143,7 +143,7 @@ public class AreasettingServiceImpl extends ServiceImpl<AreasettingMapper, Areas
} }
if(!isPc && appPermission){ if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object areasettingObj=authorizeService.getCondition(new AuthorizeConditionModel(areasettingQueryWrapper,areasettingPagination.getMenuId(),"areasetting")); Object areasettingObj=authorizeService.getCondition(new AuthorizeConditionModel(areasettingQueryWrapper,areasettingPagination.getMenuId(),"jg_areasetting"));
if (ObjectUtil.isEmpty(areasettingObj)){ if (ObjectUtil.isEmpty(areasettingObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {

@ -68,26 +68,26 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
QueryWrapper<Arinvoices_item0Entity> arinvoices_item0QueryWrapper=new QueryWrapper<>(); QueryWrapper<Arinvoices_item0Entity> arinvoices_item0QueryWrapper=new QueryWrapper<>();
int arinvoices_item1Num =0; int arinvoices_item1Num =0;
QueryWrapper<Arinvoices_item1Entity> arinvoices_item1QueryWrapper=new QueryWrapper<>(); QueryWrapper<Arinvoices_item1Entity> arinvoices_item1QueryWrapper=new QueryWrapper<>();
boolean pcPermission = false; boolean pcPermission = true;
boolean appPermission = false; boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){ if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object arinvoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoicesQueryWrapper,arinvoicesPagination.getMenuId(),"arinvoices")); Object arinvoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoicesQueryWrapper,arinvoicesPagination.getMenuId(),"jg_arinvoices"));
if (ObjectUtil.isEmpty(arinvoicesObj)){ if (ObjectUtil.isEmpty(arinvoicesObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
arinvoicesQueryWrapper = (QueryWrapper<ArinvoicesEntity>)arinvoicesObj; arinvoicesQueryWrapper = (QueryWrapper<ArinvoicesEntity>)arinvoicesObj;
arinvoicesNum++; arinvoicesNum++;
} }
Object arinvoices_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0QueryWrapper,arinvoicesPagination.getMenuId(),"arinvoices_item0")); Object arinvoices_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0QueryWrapper,arinvoicesPagination.getMenuId(),"jg_arinvoices_item0"));
if (ObjectUtil.isEmpty(arinvoices_item0Obj)){ if (ObjectUtil.isEmpty(arinvoices_item0Obj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
arinvoices_item0QueryWrapper = (QueryWrapper<Arinvoices_item0Entity>)arinvoices_item0Obj; arinvoices_item0QueryWrapper = (QueryWrapper<Arinvoices_item0Entity>)arinvoices_item0Obj;
arinvoices_item0Num++; arinvoices_item0Num++;
} }
Object arinvoices_item1Obj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item1QueryWrapper,arinvoicesPagination.getMenuId(),"arinvoices_item1")); Object arinvoices_item1Obj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item1QueryWrapper,arinvoicesPagination.getMenuId(),"jg_arinvoices_item1"));
if (ObjectUtil.isEmpty(arinvoices_item1Obj)){ if (ObjectUtil.isEmpty(arinvoices_item1Obj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -98,7 +98,7 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
} }
if(!isPc && appPermission){ if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object arinvoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoicesQueryWrapper,arinvoicesPagination.getMenuId(),"arinvoices")); Object arinvoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoicesQueryWrapper,arinvoicesPagination.getMenuId(),"jg_arinvoices"));
if (ObjectUtil.isEmpty(arinvoicesObj)){ if (ObjectUtil.isEmpty(arinvoicesObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -107,7 +107,7 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
} }
Object arinvoices_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0QueryWrapper,arinvoicesPagination.getMenuId(),"arinvoices_item0")); Object arinvoices_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0QueryWrapper,arinvoicesPagination.getMenuId(),"jg_arinvoices_item0"));
if (ObjectUtil.isEmpty(arinvoices_item0Obj)){ if (ObjectUtil.isEmpty(arinvoices_item0Obj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -116,7 +116,7 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
} }
Object arinvoices_item1Obj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item1QueryWrapper,arinvoicesPagination.getMenuId(),"arinvoices_item1")); Object arinvoices_item1Obj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item1QueryWrapper,arinvoicesPagination.getMenuId(),"jg_arinvoices_item1"));
if (ObjectUtil.isEmpty(arinvoices_item1Obj)){ if (ObjectUtil.isEmpty(arinvoices_item1Obj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -170,26 +170,26 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
QueryWrapper<Arinvoices_item0Entity> arinvoices_item0QueryWrapper=new QueryWrapper<>(); QueryWrapper<Arinvoices_item0Entity> arinvoices_item0QueryWrapper=new QueryWrapper<>();
int arinvoices_item1Num =0; int arinvoices_item1Num =0;
QueryWrapper<Arinvoices_item1Entity> arinvoices_item1QueryWrapper=new QueryWrapper<>(); QueryWrapper<Arinvoices_item1Entity> arinvoices_item1QueryWrapper=new QueryWrapper<>();
boolean pcPermission = false; boolean pcPermission = true;
boolean appPermission = false; boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){ if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object arinvoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoicesQueryWrapper,arinvoicesPagination.getMenuId(),"arinvoices")); Object arinvoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoicesQueryWrapper,arinvoicesPagination.getMenuId(),"jg_arinvoices"));
if (ObjectUtil.isEmpty(arinvoicesObj)){ if (ObjectUtil.isEmpty(arinvoicesObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
arinvoicesQueryWrapper = (QueryWrapper<ArinvoicesEntity>)arinvoicesObj; arinvoicesQueryWrapper = (QueryWrapper<ArinvoicesEntity>)arinvoicesObj;
arinvoicesNum++; arinvoicesNum++;
} }
Object arinvoices_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0QueryWrapper,arinvoicesPagination.getMenuId(),"arinvoices_item0")); Object arinvoices_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0QueryWrapper,arinvoicesPagination.getMenuId(),"jg_arinvoices_item0"));
if (ObjectUtil.isEmpty(arinvoices_item0Obj)){ if (ObjectUtil.isEmpty(arinvoices_item0Obj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
arinvoices_item0QueryWrapper = (QueryWrapper<Arinvoices_item0Entity>)arinvoices_item0Obj; arinvoices_item0QueryWrapper = (QueryWrapper<Arinvoices_item0Entity>)arinvoices_item0Obj;
arinvoices_item0Num++; arinvoices_item0Num++;
} }
Object arinvoices_item1Obj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item1QueryWrapper,arinvoicesPagination.getMenuId(),"arinvoices_item1")); Object arinvoices_item1Obj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item1QueryWrapper,arinvoicesPagination.getMenuId(),"jg_arinvoices_item1"));
if (ObjectUtil.isEmpty(arinvoices_item1Obj)){ if (ObjectUtil.isEmpty(arinvoices_item1Obj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -200,7 +200,7 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
} }
if(!isPc && appPermission){ if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object arinvoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoicesQueryWrapper,arinvoicesPagination.getMenuId(),"arinvoices")); Object arinvoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoicesQueryWrapper,arinvoicesPagination.getMenuId(),"jg_arinvoices"));
if (ObjectUtil.isEmpty(arinvoicesObj)){ if (ObjectUtil.isEmpty(arinvoicesObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -209,7 +209,7 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
} }
Object arinvoices_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0QueryWrapper,arinvoicesPagination.getMenuId(),"arinvoices_item0")); Object arinvoices_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0QueryWrapper,arinvoicesPagination.getMenuId(),"jg_arinvoices_item0"));
if (ObjectUtil.isEmpty(arinvoices_item0Obj)){ if (ObjectUtil.isEmpty(arinvoices_item0Obj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -218,7 +218,7 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
} }
Object arinvoices_item1Obj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item1QueryWrapper,arinvoicesPagination.getMenuId(),"arinvoices_item1")); Object arinvoices_item1Obj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item1QueryWrapper,arinvoicesPagination.getMenuId(),"jg_arinvoices_item1"));
if (ObjectUtil.isEmpty(arinvoices_item1Obj)){ if (ObjectUtil.isEmpty(arinvoices_item1Obj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {

@ -66,19 +66,19 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
QueryWrapper<CollectionEntity> collectionQueryWrapper=new QueryWrapper<>(); QueryWrapper<CollectionEntity> collectionQueryWrapper=new QueryWrapper<>();
int collection_item0Num =0; int collection_item0Num =0;
QueryWrapper<Collection_item0Entity> collection_item0QueryWrapper=new QueryWrapper<>(); QueryWrapper<Collection_item0Entity> collection_item0QueryWrapper=new QueryWrapper<>();
boolean pcPermission = false; boolean pcPermission = true;
boolean appPermission = false; boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){ if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object collectionObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionQueryWrapper,collectionPagination.getMenuId(),"collection")); Object collectionObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionQueryWrapper,collectionPagination.getMenuId(),"jg_collection"));
if (ObjectUtil.isEmpty(collectionObj)){ if (ObjectUtil.isEmpty(collectionObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
collectionQueryWrapper = (QueryWrapper<CollectionEntity>)collectionObj; collectionQueryWrapper = (QueryWrapper<CollectionEntity>)collectionObj;
collectionNum++; collectionNum++;
} }
Object collection_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(collection_item0QueryWrapper,collectionPagination.getMenuId(),"collection_item0")); Object collection_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(collection_item0QueryWrapper,collectionPagination.getMenuId(),"jg_collection_item0"));
if (ObjectUtil.isEmpty(collection_item0Obj)){ if (ObjectUtil.isEmpty(collection_item0Obj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -89,7 +89,7 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
} }
if(!isPc && appPermission){ if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object collectionObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionQueryWrapper,collectionPagination.getMenuId(),"collection")); Object collectionObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionQueryWrapper,collectionPagination.getMenuId(),"jg_collection"));
if (ObjectUtil.isEmpty(collectionObj)){ if (ObjectUtil.isEmpty(collectionObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -98,7 +98,7 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
} }
Object collection_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(collection_item0QueryWrapper,collectionPagination.getMenuId(),"collection_item0")); Object collection_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(collection_item0QueryWrapper,collectionPagination.getMenuId(),"jg_collection_item0"));
if (ObjectUtil.isEmpty(collection_item0Obj)){ if (ObjectUtil.isEmpty(collection_item0Obj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -150,19 +150,19 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
QueryWrapper<CollectionEntity> collectionQueryWrapper=new QueryWrapper<>(); QueryWrapper<CollectionEntity> collectionQueryWrapper=new QueryWrapper<>();
int collection_item0Num =0; int collection_item0Num =0;
QueryWrapper<Collection_item0Entity> collection_item0QueryWrapper=new QueryWrapper<>(); QueryWrapper<Collection_item0Entity> collection_item0QueryWrapper=new QueryWrapper<>();
boolean pcPermission = false; boolean pcPermission = true;
boolean appPermission = false; boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){ if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object collectionObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionQueryWrapper,collectionPagination.getMenuId(),"collection")); Object collectionObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionQueryWrapper,collectionPagination.getMenuId(),"jg_collection"));
if (ObjectUtil.isEmpty(collectionObj)){ if (ObjectUtil.isEmpty(collectionObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
collectionQueryWrapper = (QueryWrapper<CollectionEntity>)collectionObj; collectionQueryWrapper = (QueryWrapper<CollectionEntity>)collectionObj;
collectionNum++; collectionNum++;
} }
Object collection_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(collection_item0QueryWrapper,collectionPagination.getMenuId(),"collection_item0")); Object collection_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(collection_item0QueryWrapper,collectionPagination.getMenuId(),"jg_collection_item0"));
if (ObjectUtil.isEmpty(collection_item0Obj)){ if (ObjectUtil.isEmpty(collection_item0Obj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -173,7 +173,7 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
} }
if(!isPc && appPermission){ if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object collectionObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionQueryWrapper,collectionPagination.getMenuId(),"collection")); Object collectionObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionQueryWrapper,collectionPagination.getMenuId(),"jg_collection"));
if (ObjectUtil.isEmpty(collectionObj)){ if (ObjectUtil.isEmpty(collectionObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -182,7 +182,7 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
} }
Object collection_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(collection_item0QueryWrapper,collectionPagination.getMenuId(),"collection_item0")); Object collection_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(collection_item0QueryWrapper,collectionPagination.getMenuId(),"jg_collection_item0"));
if (ObjectUtil.isEmpty(collection_item0Obj)){ if (ObjectUtil.isEmpty(collection_item0Obj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {

@ -55,8 +55,8 @@ public class CustomerVOServiceImpl extends ServiceImpl<CustomerVMapper, Customer
int total=0; int total=0;
int customerNum =0; int customerNum =0;
QueryWrapper<CustomerEntity> customerQueryWrapper=new QueryWrapper<>(); QueryWrapper<CustomerEntity> customerQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false; boolean pcPermission = true;
boolean appPermission = false; boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){ if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
@ -144,8 +144,8 @@ public class CustomerVOServiceImpl extends ServiceImpl<CustomerVMapper, Customer
int total=0; int total=0;
int customerNum =0; int customerNum =0;
QueryWrapper<CustomerEntity> customerQueryWrapper=new QueryWrapper<>(); QueryWrapper<CustomerEntity> customerQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false; boolean pcPermission = true;
boolean appPermission = false; boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){ if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){

@ -51,12 +51,12 @@ public class InventoryOrgServiceImpl extends ServiceImpl<InventoryOrgMapper, Inv
int total=0; int total=0;
int inventoryOrgNum =0; int inventoryOrgNum =0;
QueryWrapper<InventoryOrgEntity> inventoryOrgQueryWrapper=new QueryWrapper<>(); QueryWrapper<InventoryOrgEntity> inventoryOrgQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false; boolean pcPermission = true;
boolean appPermission = false; boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){ if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object inventoryOrgObj=authorizeService.getCondition(new AuthorizeConditionModel(inventoryOrgQueryWrapper,inventoryOrgPagination.getMenuId(),"inventoryOrg")); Object inventoryOrgObj=authorizeService.getCondition(new AuthorizeConditionModel(inventoryOrgQueryWrapper,inventoryOrgPagination.getMenuId(),"jg_inventoryOrg"));
if (ObjectUtil.isEmpty(inventoryOrgObj)){ if (ObjectUtil.isEmpty(inventoryOrgObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -67,7 +67,7 @@ public class InventoryOrgServiceImpl extends ServiceImpl<InventoryOrgMapper, Inv
} }
if(!isPc && appPermission){ if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object inventoryOrgObj=authorizeService.getCondition(new AuthorizeConditionModel(inventoryOrgQueryWrapper,inventoryOrgPagination.getMenuId(),"inventoryOrg")); Object inventoryOrgObj=authorizeService.getCondition(new AuthorizeConditionModel(inventoryOrgQueryWrapper,inventoryOrgPagination.getMenuId(),"jg_inventoryOrg"));
if (ObjectUtil.isEmpty(inventoryOrgObj)){ if (ObjectUtil.isEmpty(inventoryOrgObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -122,12 +122,12 @@ public class InventoryOrgServiceImpl extends ServiceImpl<InventoryOrgMapper, Inv
int total=0; int total=0;
int inventoryOrgNum =0; int inventoryOrgNum =0;
QueryWrapper<InventoryOrgEntity> inventoryOrgQueryWrapper=new QueryWrapper<>(); QueryWrapper<InventoryOrgEntity> inventoryOrgQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false; boolean pcPermission = true;
boolean appPermission = false; boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){ if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object inventoryOrgObj=authorizeService.getCondition(new AuthorizeConditionModel(inventoryOrgQueryWrapper,inventoryOrgPagination.getMenuId(),"inventoryOrg")); Object inventoryOrgObj=authorizeService.getCondition(new AuthorizeConditionModel(inventoryOrgQueryWrapper,inventoryOrgPagination.getMenuId(),"jg_inventoryOrg"));
if (ObjectUtil.isEmpty(inventoryOrgObj)){ if (ObjectUtil.isEmpty(inventoryOrgObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -138,7 +138,7 @@ public class InventoryOrgServiceImpl extends ServiceImpl<InventoryOrgMapper, Inv
} }
if(!isPc && appPermission){ if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object inventoryOrgObj=authorizeService.getCondition(new AuthorizeConditionModel(inventoryOrgQueryWrapper,inventoryOrgPagination.getMenuId(),"inventoryOrg")); Object inventoryOrgObj=authorizeService.getCondition(new AuthorizeConditionModel(inventoryOrgQueryWrapper,inventoryOrgPagination.getMenuId(),"jg_inventoryOrg"));
if (ObjectUtil.isEmpty(inventoryOrgObj)){ if (ObjectUtil.isEmpty(inventoryOrgObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {

@ -51,12 +51,12 @@ public class InventoryOrgDetailServiceImpl extends ServiceImpl<InventoryOrgDetai
int total=0; int total=0;
int inventoryOrgDetailNum =0; int inventoryOrgDetailNum =0;
QueryWrapper<InventoryOrgDetailEntity> inventoryOrgDetailQueryWrapper=new QueryWrapper<>(); QueryWrapper<InventoryOrgDetailEntity> inventoryOrgDetailQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false; boolean pcPermission = true;
boolean appPermission = false; boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){ if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object inventoryOrgDetailObj=authorizeService.getCondition(new AuthorizeConditionModel(inventoryOrgDetailQueryWrapper,inventoryOrgDetailPagination.getMenuId(),"inventoryOrgDetail")); Object inventoryOrgDetailObj=authorizeService.getCondition(new AuthorizeConditionModel(inventoryOrgDetailQueryWrapper,inventoryOrgDetailPagination.getMenuId(),"jg_inventoryOrgDetail"));
if (ObjectUtil.isEmpty(inventoryOrgDetailObj)){ if (ObjectUtil.isEmpty(inventoryOrgDetailObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -67,7 +67,7 @@ public class InventoryOrgDetailServiceImpl extends ServiceImpl<InventoryOrgDetai
} }
if(!isPc && appPermission){ if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object inventoryOrgDetailObj=authorizeService.getCondition(new AuthorizeConditionModel(inventoryOrgDetailQueryWrapper,inventoryOrgDetailPagination.getMenuId(),"inventoryOrgDetail")); Object inventoryOrgDetailObj=authorizeService.getCondition(new AuthorizeConditionModel(inventoryOrgDetailQueryWrapper,inventoryOrgDetailPagination.getMenuId(),"jg_inventoryOrgDetail"));
if (ObjectUtil.isEmpty(inventoryOrgDetailObj)){ if (ObjectUtil.isEmpty(inventoryOrgDetailObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -122,12 +122,12 @@ public class InventoryOrgDetailServiceImpl extends ServiceImpl<InventoryOrgDetai
int total=0; int total=0;
int inventoryOrgDetailNum =0; int inventoryOrgDetailNum =0;
QueryWrapper<InventoryOrgDetailEntity> inventoryOrgDetailQueryWrapper=new QueryWrapper<>(); QueryWrapper<InventoryOrgDetailEntity> inventoryOrgDetailQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false; boolean pcPermission = true;
boolean appPermission = false; boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){ if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object inventoryOrgDetailObj=authorizeService.getCondition(new AuthorizeConditionModel(inventoryOrgDetailQueryWrapper,inventoryOrgDetailPagination.getMenuId(),"inventoryOrgDetail")); Object inventoryOrgDetailObj=authorizeService.getCondition(new AuthorizeConditionModel(inventoryOrgDetailQueryWrapper,inventoryOrgDetailPagination.getMenuId(),"jg_inventoryOrgDetail"));
if (ObjectUtil.isEmpty(inventoryOrgDetailObj)){ if (ObjectUtil.isEmpty(inventoryOrgDetailObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -138,7 +138,7 @@ public class InventoryOrgDetailServiceImpl extends ServiceImpl<InventoryOrgDetai
} }
if(!isPc && appPermission){ if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object inventoryOrgDetailObj=authorizeService.getCondition(new AuthorizeConditionModel(inventoryOrgDetailQueryWrapper,inventoryOrgDetailPagination.getMenuId(),"inventoryOrgDetail")); Object inventoryOrgDetailObj=authorizeService.getCondition(new AuthorizeConditionModel(inventoryOrgDetailQueryWrapper,inventoryOrgDetailPagination.getMenuId(),"jg_inventoryOrgDetail"));
if (ObjectUtil.isEmpty(inventoryOrgDetailObj)){ if (ObjectUtil.isEmpty(inventoryOrgDetailObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {

@ -71,26 +71,26 @@ public class InvoicesServiceImpl extends ServiceImpl<InvoicesMapper, InvoicesEnt
QueryWrapper<InvoicesItem0Entity> invoicesItem0QueryWrapper=new QueryWrapper<>(); QueryWrapper<InvoicesItem0Entity> invoicesItem0QueryWrapper=new QueryWrapper<>();
int invoicesItem1Num =0; int invoicesItem1Num =0;
QueryWrapper<InvoicesItem1Entity> invoicesItem1QueryWrapper=new QueryWrapper<>(); QueryWrapper<InvoicesItem1Entity> invoicesItem1QueryWrapper=new QueryWrapper<>();
boolean pcPermission = false; boolean pcPermission = true;
boolean appPermission = false; boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){ if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object invoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesQueryWrapper,invoicesPagination.getMenuId(),"invoices")); Object invoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesQueryWrapper,invoicesPagination.getMenuId(),"jg_invoices"));
if (ObjectUtil.isEmpty(invoicesObj)){ if (ObjectUtil.isEmpty(invoicesObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
invoicesQueryWrapper = (QueryWrapper<InvoicesEntity>)invoicesObj; invoicesQueryWrapper = (QueryWrapper<InvoicesEntity>)invoicesObj;
invoicesNum++; invoicesNum++;
} }
Object invoicesItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesItem0QueryWrapper,invoicesPagination.getMenuId(),"invoicesItem0")); Object invoicesItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesItem0QueryWrapper,invoicesPagination.getMenuId(),"jg_invoicesItem0"));
if (ObjectUtil.isEmpty(invoicesItem0Obj)){ if (ObjectUtil.isEmpty(invoicesItem0Obj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
invoicesItem0QueryWrapper = (QueryWrapper<InvoicesItem0Entity>)invoicesItem0Obj; invoicesItem0QueryWrapper = (QueryWrapper<InvoicesItem0Entity>)invoicesItem0Obj;
invoicesItem0Num++; invoicesItem0Num++;
} }
Object invoicesItem1Obj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesItem1QueryWrapper,invoicesPagination.getMenuId(),"invoicesItem1")); Object invoicesItem1Obj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesItem1QueryWrapper,invoicesPagination.getMenuId(),"jg_invoicesItem1"));
if (ObjectUtil.isEmpty(invoicesItem1Obj)){ if (ObjectUtil.isEmpty(invoicesItem1Obj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -101,7 +101,7 @@ public class InvoicesServiceImpl extends ServiceImpl<InvoicesMapper, InvoicesEnt
} }
if(!isPc && appPermission){ if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object invoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesQueryWrapper,invoicesPagination.getMenuId(),"invoices")); Object invoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesQueryWrapper,invoicesPagination.getMenuId(),"jg_invoices"));
if (ObjectUtil.isEmpty(invoicesObj)){ if (ObjectUtil.isEmpty(invoicesObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -110,7 +110,7 @@ public class InvoicesServiceImpl extends ServiceImpl<InvoicesMapper, InvoicesEnt
} }
Object invoicesItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesItem0QueryWrapper,invoicesPagination.getMenuId(),"invoicesItem0")); Object invoicesItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesItem0QueryWrapper,invoicesPagination.getMenuId(),"jg_invoicesItem0"));
if (ObjectUtil.isEmpty(invoicesItem0Obj)){ if (ObjectUtil.isEmpty(invoicesItem0Obj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -119,7 +119,7 @@ public class InvoicesServiceImpl extends ServiceImpl<InvoicesMapper, InvoicesEnt
} }
Object invoicesItem1Obj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesItem1QueryWrapper,invoicesPagination.getMenuId(),"invoicesItem1")); Object invoicesItem1Obj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesItem1QueryWrapper,invoicesPagination.getMenuId(),"jg_invoicesItem1"));
if (ObjectUtil.isEmpty(invoicesItem1Obj)){ if (ObjectUtil.isEmpty(invoicesItem1Obj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -173,26 +173,26 @@ public class InvoicesServiceImpl extends ServiceImpl<InvoicesMapper, InvoicesEnt
QueryWrapper<InvoicesItem0Entity> invoicesItem0QueryWrapper=new QueryWrapper<>(); QueryWrapper<InvoicesItem0Entity> invoicesItem0QueryWrapper=new QueryWrapper<>();
int invoicesItem1Num =0; int invoicesItem1Num =0;
QueryWrapper<InvoicesItem1Entity> invoicesItem1QueryWrapper=new QueryWrapper<>(); QueryWrapper<InvoicesItem1Entity> invoicesItem1QueryWrapper=new QueryWrapper<>();
boolean pcPermission = false; boolean pcPermission = true;
boolean appPermission = false; boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){ if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object invoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesQueryWrapper,invoicesPagination.getMenuId(),"invoices")); Object invoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesQueryWrapper,invoicesPagination.getMenuId(),"jg_invoices"));
if (ObjectUtil.isEmpty(invoicesObj)){ if (ObjectUtil.isEmpty(invoicesObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
invoicesQueryWrapper = (QueryWrapper<InvoicesEntity>)invoicesObj; invoicesQueryWrapper = (QueryWrapper<InvoicesEntity>)invoicesObj;
invoicesNum++; invoicesNum++;
} }
Object invoicesItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesItem0QueryWrapper,invoicesPagination.getMenuId(),"invoicesItem0")); Object invoicesItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesItem0QueryWrapper,invoicesPagination.getMenuId(),"jg_invoicesItem0"));
if (ObjectUtil.isEmpty(invoicesItem0Obj)){ if (ObjectUtil.isEmpty(invoicesItem0Obj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
invoicesItem0QueryWrapper = (QueryWrapper<InvoicesItem0Entity>)invoicesItem0Obj; invoicesItem0QueryWrapper = (QueryWrapper<InvoicesItem0Entity>)invoicesItem0Obj;
invoicesItem0Num++; invoicesItem0Num++;
} }
Object invoicesItem1Obj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesItem1QueryWrapper,invoicesPagination.getMenuId(),"invoicesItem1")); Object invoicesItem1Obj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesItem1QueryWrapper,invoicesPagination.getMenuId(),"jg_invoicesItem1"));
if (ObjectUtil.isEmpty(invoicesItem1Obj)){ if (ObjectUtil.isEmpty(invoicesItem1Obj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -203,7 +203,7 @@ public class InvoicesServiceImpl extends ServiceImpl<InvoicesMapper, InvoicesEnt
} }
if(!isPc && appPermission){ if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object invoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesQueryWrapper,invoicesPagination.getMenuId(),"invoices")); Object invoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesQueryWrapper,invoicesPagination.getMenuId(),"jg_invoices"));
if (ObjectUtil.isEmpty(invoicesObj)){ if (ObjectUtil.isEmpty(invoicesObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -212,7 +212,7 @@ public class InvoicesServiceImpl extends ServiceImpl<InvoicesMapper, InvoicesEnt
} }
Object invoicesItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesItem0QueryWrapper,invoicesPagination.getMenuId(),"invoicesItem0")); Object invoicesItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesItem0QueryWrapper,invoicesPagination.getMenuId(),"jg_invoicesItem0"));
if (ObjectUtil.isEmpty(invoicesItem0Obj)){ if (ObjectUtil.isEmpty(invoicesItem0Obj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -221,7 +221,7 @@ public class InvoicesServiceImpl extends ServiceImpl<InvoicesMapper, InvoicesEnt
} }
Object invoicesItem1Obj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesItem1QueryWrapper,invoicesPagination.getMenuId(),"invoicesItem1")); Object invoicesItem1Obj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesItem1QueryWrapper,invoicesPagination.getMenuId(),"jg_invoicesItem1"));
if (ObjectUtil.isEmpty(invoicesItem1Obj)){ if (ObjectUtil.isEmpty(invoicesItem1Obj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {

@ -67,12 +67,12 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, MaterialEnt
int total=0; int total=0;
int materialNum =0; int materialNum =0;
QueryWrapper<MaterialEntity> materialQueryWrapper=new QueryWrapper<>(); QueryWrapper<MaterialEntity> materialQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false; boolean pcPermission = true;
boolean appPermission = false; boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){ if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object materialObj=authorizeService.getCondition(new AuthorizeConditionModel(materialQueryWrapper,materialPagination.getMenuId(),"material")); Object materialObj=authorizeService.getCondition(new AuthorizeConditionModel(materialQueryWrapper,materialPagination.getMenuId(),"jg_material"));
if (ObjectUtil.isEmpty(materialObj)){ if (ObjectUtil.isEmpty(materialObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -83,7 +83,7 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, MaterialEnt
} }
if(!isPc && appPermission){ if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object materialObj=authorizeService.getCondition(new AuthorizeConditionModel(materialQueryWrapper,materialPagination.getMenuId(),"material")); Object materialObj=authorizeService.getCondition(new AuthorizeConditionModel(materialQueryWrapper,materialPagination.getMenuId(),"jg_material"));
if (ObjectUtil.isEmpty(materialObj)){ if (ObjectUtil.isEmpty(materialObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -138,12 +138,12 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, MaterialEnt
int total=0; int total=0;
int materialNum =0; int materialNum =0;
QueryWrapper<MaterialEntity> materialQueryWrapper=new QueryWrapper<>(); QueryWrapper<MaterialEntity> materialQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false; boolean pcPermission = true;
boolean appPermission = false; boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){ if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object materialObj=authorizeService.getCondition(new AuthorizeConditionModel(materialQueryWrapper,materialPagination.getMenuId(),"material")); Object materialObj=authorizeService.getCondition(new AuthorizeConditionModel(materialQueryWrapper,materialPagination.getMenuId(),"jg_material"));
if (ObjectUtil.isEmpty(materialObj)){ if (ObjectUtil.isEmpty(materialObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -154,7 +154,7 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, MaterialEnt
} }
if(!isPc && appPermission){ if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object materialObj=authorizeService.getCondition(new AuthorizeConditionModel(materialQueryWrapper,materialPagination.getMenuId(),"material")); Object materialObj=authorizeService.getCondition(new AuthorizeConditionModel(materialQueryWrapper,materialPagination.getMenuId(),"jg_material"));
if (ObjectUtil.isEmpty(materialObj)){ if (ObjectUtil.isEmpty(materialObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {

@ -54,12 +54,12 @@ public class MonitoringitemServiceImpl extends ServiceImpl<MonitoringitemMapper,
int total=0; int total=0;
int monitoringitemNum =0; int monitoringitemNum =0;
QueryWrapper<MonitoringitemEntity> monitoringitemQueryWrapper=new QueryWrapper<>(); QueryWrapper<MonitoringitemEntity> monitoringitemQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false; boolean pcPermission = true;
boolean appPermission = false; boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){ if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object monitoringitemObj=authorizeService.getCondition(new AuthorizeConditionModel(monitoringitemQueryWrapper,monitoringitemPagination.getMenuId(),"monitoringitem")); Object monitoringitemObj=authorizeService.getCondition(new AuthorizeConditionModel(monitoringitemQueryWrapper,monitoringitemPagination.getMenuId(),"jg_monitoringitem"));
if (ObjectUtil.isEmpty(monitoringitemObj)){ if (ObjectUtil.isEmpty(monitoringitemObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -70,7 +70,7 @@ public class MonitoringitemServiceImpl extends ServiceImpl<MonitoringitemMapper,
} }
if(!isPc && appPermission){ if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object monitoringitemObj=authorizeService.getCondition(new AuthorizeConditionModel(monitoringitemQueryWrapper,monitoringitemPagination.getMenuId(),"monitoringitem")); Object monitoringitemObj=authorizeService.getCondition(new AuthorizeConditionModel(monitoringitemQueryWrapper,monitoringitemPagination.getMenuId(),"jg_monitoringitem"));
if (ObjectUtil.isEmpty(monitoringitemObj)){ if (ObjectUtil.isEmpty(monitoringitemObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -125,12 +125,12 @@ public class MonitoringitemServiceImpl extends ServiceImpl<MonitoringitemMapper,
int total=0; int total=0;
int monitoringitemNum =0; int monitoringitemNum =0;
QueryWrapper<MonitoringitemEntity> monitoringitemQueryWrapper=new QueryWrapper<>(); QueryWrapper<MonitoringitemEntity> monitoringitemQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false; boolean pcPermission = true;
boolean appPermission = false; boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){ if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object monitoringitemObj=authorizeService.getCondition(new AuthorizeConditionModel(monitoringitemQueryWrapper,monitoringitemPagination.getMenuId(),"monitoringitem")); Object monitoringitemObj=authorizeService.getCondition(new AuthorizeConditionModel(monitoringitemQueryWrapper,monitoringitemPagination.getMenuId(),"jg_monitoringitem"));
if (ObjectUtil.isEmpty(monitoringitemObj)){ if (ObjectUtil.isEmpty(monitoringitemObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -141,7 +141,7 @@ public class MonitoringitemServiceImpl extends ServiceImpl<MonitoringitemMapper,
} }
if(!isPc && appPermission){ if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object monitoringitemObj=authorizeService.getCondition(new AuthorizeConditionModel(monitoringitemQueryWrapper,monitoringitemPagination.getMenuId(),"monitoringitem")); Object monitoringitemObj=authorizeService.getCondition(new AuthorizeConditionModel(monitoringitemQueryWrapper,monitoringitemPagination.getMenuId(),"jg_monitoringitem"));
if (ObjectUtil.isEmpty(monitoringitemObj)){ if (ObjectUtil.isEmpty(monitoringitemObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {

@ -68,19 +68,19 @@ public class PaymentServiceImpl extends ServiceImpl<PaymentMapper, PaymentEntity
QueryWrapper<PaymentEntity> paymentQueryWrapper=new QueryWrapper<>(); QueryWrapper<PaymentEntity> paymentQueryWrapper=new QueryWrapper<>();
int payment_item0Num =0; int payment_item0Num =0;
QueryWrapper<Payment_item0Entity> payment_item0QueryWrapper=new QueryWrapper<>(); QueryWrapper<Payment_item0Entity> payment_item0QueryWrapper=new QueryWrapper<>();
boolean pcPermission = false; boolean pcPermission = true;
boolean appPermission = true; boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){ if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object paymentObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentQueryWrapper,paymentPagination.getMenuId(),"payment")); Object paymentObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentQueryWrapper,paymentPagination.getMenuId(),"jg_payment"));
if (ObjectUtil.isEmpty(paymentObj)){ if (ObjectUtil.isEmpty(paymentObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
paymentQueryWrapper = (QueryWrapper<PaymentEntity>)paymentObj; paymentQueryWrapper = (QueryWrapper<PaymentEntity>)paymentObj;
paymentNum++; paymentNum++;
} }
Object payment_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(payment_item0QueryWrapper,paymentPagination.getMenuId(),"payment_item0")); Object payment_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(payment_item0QueryWrapper,paymentPagination.getMenuId(),"jg_payment_item0"));
if (ObjectUtil.isEmpty(payment_item0Obj)){ if (ObjectUtil.isEmpty(payment_item0Obj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -91,7 +91,7 @@ public class PaymentServiceImpl extends ServiceImpl<PaymentMapper, PaymentEntity
} }
if(!isPc && appPermission){ if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object paymentObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentQueryWrapper,paymentPagination.getMenuId(),"payment")); Object paymentObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentQueryWrapper,paymentPagination.getMenuId(),"jg_payment"));
if (ObjectUtil.isEmpty(paymentObj)){ if (ObjectUtil.isEmpty(paymentObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -100,7 +100,7 @@ public class PaymentServiceImpl extends ServiceImpl<PaymentMapper, PaymentEntity
} }
Object payment_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(payment_item0QueryWrapper,paymentPagination.getMenuId(),"payment_item0")); Object payment_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(payment_item0QueryWrapper,paymentPagination.getMenuId(),"jg_payment_item0"));
if (ObjectUtil.isEmpty(payment_item0Obj)){ if (ObjectUtil.isEmpty(payment_item0Obj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -152,19 +152,19 @@ public class PaymentServiceImpl extends ServiceImpl<PaymentMapper, PaymentEntity
QueryWrapper<PaymentEntity> paymentQueryWrapper=new QueryWrapper<>(); QueryWrapper<PaymentEntity> paymentQueryWrapper=new QueryWrapper<>();
int payment_item0Num =0; int payment_item0Num =0;
QueryWrapper<Payment_item0Entity> payment_item0QueryWrapper=new QueryWrapper<>(); QueryWrapper<Payment_item0Entity> payment_item0QueryWrapper=new QueryWrapper<>();
boolean pcPermission = false; boolean pcPermission = true;
boolean appPermission = true; boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){ if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object paymentObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentQueryWrapper,paymentPagination.getMenuId(),"payment")); Object paymentObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentQueryWrapper,paymentPagination.getMenuId(),"jg_payment"));
if (ObjectUtil.isEmpty(paymentObj)){ if (ObjectUtil.isEmpty(paymentObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
paymentQueryWrapper = (QueryWrapper<PaymentEntity>)paymentObj; paymentQueryWrapper = (QueryWrapper<PaymentEntity>)paymentObj;
paymentNum++; paymentNum++;
} }
Object payment_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(payment_item0QueryWrapper,paymentPagination.getMenuId(),"payment_item0")); Object payment_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(payment_item0QueryWrapper,paymentPagination.getMenuId(),"jg_payment_item0"));
if (ObjectUtil.isEmpty(payment_item0Obj)){ if (ObjectUtil.isEmpty(payment_item0Obj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -175,7 +175,7 @@ public class PaymentServiceImpl extends ServiceImpl<PaymentMapper, PaymentEntity
} }
if(!isPc && appPermission){ if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object paymentObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentQueryWrapper,paymentPagination.getMenuId(),"payment")); Object paymentObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentQueryWrapper,paymentPagination.getMenuId(),"jg_payment"));
if (ObjectUtil.isEmpty(paymentObj)){ if (ObjectUtil.isEmpty(paymentObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -184,7 +184,7 @@ public class PaymentServiceImpl extends ServiceImpl<PaymentMapper, PaymentEntity
} }
Object payment_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(payment_item0QueryWrapper,paymentPagination.getMenuId(),"payment_item0")); Object payment_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(payment_item0QueryWrapper,paymentPagination.getMenuId(),"jg_payment_item0"));
if (ObjectUtil.isEmpty(payment_item0Obj)){ if (ObjectUtil.isEmpty(payment_item0Obj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {

@ -67,19 +67,19 @@ public class PaymentdocServiceImpl extends ServiceImpl<PaymentdocMapper, Payment
QueryWrapper<PaymentdocEntity> paymentdocQueryWrapper=new QueryWrapper<>(); QueryWrapper<PaymentdocEntity> paymentdocQueryWrapper=new QueryWrapper<>();
int paymentdocItem0Num =0; int paymentdocItem0Num =0;
QueryWrapper<PaymentdocItem0Entity> paymentdocItem0QueryWrapper=new QueryWrapper<>(); QueryWrapper<PaymentdocItem0Entity> paymentdocItem0QueryWrapper=new QueryWrapper<>();
boolean pcPermission = false; boolean pcPermission = true;
boolean appPermission = false; boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){ if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object paymentdocObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocQueryWrapper,paymentdocPagination.getMenuId(),"paymentdoc")); Object paymentdocObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocQueryWrapper,paymentdocPagination.getMenuId(),"jg_paymentdoc"));
if (ObjectUtil.isEmpty(paymentdocObj)){ if (ObjectUtil.isEmpty(paymentdocObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
paymentdocQueryWrapper = (QueryWrapper<PaymentdocEntity>)paymentdocObj; paymentdocQueryWrapper = (QueryWrapper<PaymentdocEntity>)paymentdocObj;
paymentdocNum++; paymentdocNum++;
} }
Object paymentdocItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem0QueryWrapper,paymentdocPagination.getMenuId(),"paymentdocItem0")); Object paymentdocItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem0QueryWrapper,paymentdocPagination.getMenuId(),"jg_paymentdocItem0"));
if (ObjectUtil.isEmpty(paymentdocItem0Obj)){ if (ObjectUtil.isEmpty(paymentdocItem0Obj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -90,14 +90,14 @@ public class PaymentdocServiceImpl extends ServiceImpl<PaymentdocMapper, Payment
} }
if(!isPc && appPermission){ if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object paymentdocObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocQueryWrapper,paymentdocPagination.getMenuId(),"paymentdoc")); Object paymentdocObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocQueryWrapper,paymentdocPagination.getMenuId(),"jg_paymentdoc"));
if (ObjectUtil.isEmpty(paymentdocObj)){ if (ObjectUtil.isEmpty(paymentdocObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
paymentdocQueryWrapper = (QueryWrapper<PaymentdocEntity>)paymentdocObj; paymentdocQueryWrapper = (QueryWrapper<PaymentdocEntity>)paymentdocObj;
paymentdocNum++; paymentdocNum++;
} }
Object paymentdocItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem0QueryWrapper,paymentdocPagination.getMenuId(),"paymentdocItem0")); Object paymentdocItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem0QueryWrapper,paymentdocPagination.getMenuId(),"jg_paymentdocItem0"));
if (ObjectUtil.isEmpty(paymentdocItem0Obj)){ if (ObjectUtil.isEmpty(paymentdocItem0Obj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -147,19 +147,19 @@ public class PaymentdocServiceImpl extends ServiceImpl<PaymentdocMapper, Payment
QueryWrapper<PaymentdocEntity> paymentdocQueryWrapper=new QueryWrapper<>(); QueryWrapper<PaymentdocEntity> paymentdocQueryWrapper=new QueryWrapper<>();
int paymentdocItem0Num =0; int paymentdocItem0Num =0;
QueryWrapper<PaymentdocItem0Entity> paymentdocItem0QueryWrapper=new QueryWrapper<>(); QueryWrapper<PaymentdocItem0Entity> paymentdocItem0QueryWrapper=new QueryWrapper<>();
boolean pcPermission = false; boolean pcPermission = true;
boolean appPermission = false; boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){ if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object paymentdocObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocQueryWrapper,paymentdocPagination.getMenuId(),"paymentdoc")); Object paymentdocObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocQueryWrapper,paymentdocPagination.getMenuId(),"jg_paymentdoc"));
if (ObjectUtil.isEmpty(paymentdocObj)){ if (ObjectUtil.isEmpty(paymentdocObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
paymentdocQueryWrapper = (QueryWrapper<PaymentdocEntity>)paymentdocObj; paymentdocQueryWrapper = (QueryWrapper<PaymentdocEntity>)paymentdocObj;
paymentdocNum++; paymentdocNum++;
} }
Object paymentdocItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem0QueryWrapper,paymentdocPagination.getMenuId(),"paymentdocItem0")); Object paymentdocItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem0QueryWrapper,paymentdocPagination.getMenuId(),"jg_paymentdocItem0"));
if (ObjectUtil.isEmpty(paymentdocItem0Obj)){ if (ObjectUtil.isEmpty(paymentdocItem0Obj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -170,14 +170,14 @@ public class PaymentdocServiceImpl extends ServiceImpl<PaymentdocMapper, Payment
} }
if(!isPc && appPermission){ if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object paymentdocObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocQueryWrapper,paymentdocPagination.getMenuId(),"paymentdoc")); Object paymentdocObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocQueryWrapper,paymentdocPagination.getMenuId(),"jg_paymentdoc"));
if (ObjectUtil.isEmpty(paymentdocObj)){ if (ObjectUtil.isEmpty(paymentdocObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
paymentdocQueryWrapper = (QueryWrapper<PaymentdocEntity>)paymentdocObj; paymentdocQueryWrapper = (QueryWrapper<PaymentdocEntity>)paymentdocObj;
paymentdocNum++; paymentdocNum++;
} }
Object paymentdocItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem0QueryWrapper,paymentdocPagination.getMenuId(),"paymentdocItem0")); Object paymentdocItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem0QueryWrapper,paymentdocPagination.getMenuId(),"jg_paymentdocItem0"));
if (ObjectUtil.isEmpty(paymentdocItem0Obj)){ if (ObjectUtil.isEmpty(paymentdocItem0Obj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {

@ -62,12 +62,12 @@ public class PoundlistServiceImpl extends ServiceImpl<PoundlistMapper, Poundlist
int poundlistNum =0; int poundlistNum =0;
QueryWrapper<PoundlistEntity> poundlistQueryWrapper=new QueryWrapper<>(); QueryWrapper<PoundlistEntity> poundlistQueryWrapper=new QueryWrapper<>();
poundlistQueryWrapper.lambda().eq(PoundlistEntity::getIsExamine,"1"); poundlistQueryWrapper.lambda().eq(PoundlistEntity::getIsExamine,"1");
boolean pcPermission = false; boolean pcPermission = true;
boolean appPermission = false; boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){ if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object poundlistObj=authorizeService.getCondition(new AuthorizeConditionModel(poundlistQueryWrapper,poundlistPagination.getMenuId(),"poundlist")); Object poundlistObj=authorizeService.getCondition(new AuthorizeConditionModel(poundlistQueryWrapper,poundlistPagination.getMenuId(),"jg_poundlist"));
if (ObjectUtil.isEmpty(poundlistObj)){ if (ObjectUtil.isEmpty(poundlistObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -78,7 +78,7 @@ public class PoundlistServiceImpl extends ServiceImpl<PoundlistMapper, Poundlist
} }
if(!isPc && appPermission){ if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object poundlistObj=authorizeService.getCondition(new AuthorizeConditionModel(poundlistQueryWrapper,poundlistPagination.getMenuId(),"poundlist")); Object poundlistObj=authorizeService.getCondition(new AuthorizeConditionModel(poundlistQueryWrapper,poundlistPagination.getMenuId(),"jg_poundlist"));
if (ObjectUtil.isEmpty(poundlistObj)){ if (ObjectUtil.isEmpty(poundlistObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -139,12 +139,12 @@ public class PoundlistServiceImpl extends ServiceImpl<PoundlistMapper, Poundlist
int total=0; int total=0;
int poundlistNum =0; int poundlistNum =0;
QueryWrapper<PoundlistEntity> poundlistQueryWrapper=new QueryWrapper<>(); QueryWrapper<PoundlistEntity> poundlistQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false; boolean pcPermission = true;
boolean appPermission = false; boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){ if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object poundlistObj=authorizeService.getCondition(new AuthorizeConditionModel(poundlistQueryWrapper,poundlistPagination.getMenuId(),"poundlist")); Object poundlistObj=authorizeService.getCondition(new AuthorizeConditionModel(poundlistQueryWrapper,poundlistPagination.getMenuId(),"jg_poundlist"));
if (ObjectUtil.isEmpty(poundlistObj)){ if (ObjectUtil.isEmpty(poundlistObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -155,7 +155,7 @@ public class PoundlistServiceImpl extends ServiceImpl<PoundlistMapper, Poundlist
} }
if(!isPc && appPermission){ if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object poundlistObj=authorizeService.getCondition(new AuthorizeConditionModel(poundlistQueryWrapper,poundlistPagination.getMenuId(),"poundlist")); Object poundlistObj=authorizeService.getCondition(new AuthorizeConditionModel(poundlistQueryWrapper,poundlistPagination.getMenuId(),"jg_poundlist"));
if (ObjectUtil.isEmpty(poundlistObj)){ if (ObjectUtil.isEmpty(poundlistObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {

@ -70,26 +70,26 @@ public class PurchasebackServiceImpl extends ServiceImpl<PurchasebackMapper, Pur
QueryWrapper<Purchaseback_item0Entity> purchaseback_item0QueryWrapper=new QueryWrapper<>(); QueryWrapper<Purchaseback_item0Entity> purchaseback_item0QueryWrapper=new QueryWrapper<>();
int purchaseorderNum =0; int purchaseorderNum =0;
QueryWrapper<PurchaseorderEntity> purchaseorderQueryWrapper=new QueryWrapper<>(); QueryWrapper<PurchaseorderEntity> purchaseorderQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false; boolean pcPermission = true;
boolean appPermission = false; boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){ if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object purchasebackObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackQueryWrapper,purchasebackPagination.getMenuId(),"purchaseback")); Object purchasebackObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackQueryWrapper,purchasebackPagination.getMenuId(),"jg_purchaseback"));
if (ObjectUtil.isEmpty(purchasebackObj)){ if (ObjectUtil.isEmpty(purchasebackObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
purchasebackQueryWrapper = (QueryWrapper<PurchasebackEntity>)purchasebackObj; purchasebackQueryWrapper = (QueryWrapper<PurchasebackEntity>)purchasebackObj;
purchasebackNum++; purchasebackNum++;
} }
Object purchaseback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseback_item0QueryWrapper,purchasebackPagination.getMenuId(),"purchaseback_item0")); Object purchaseback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseback_item0QueryWrapper,purchasebackPagination.getMenuId(),"jg_purchaseback_item0"));
if (ObjectUtil.isEmpty(purchaseback_item0Obj)){ if (ObjectUtil.isEmpty(purchaseback_item0Obj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
purchaseback_item0QueryWrapper = (QueryWrapper<Purchaseback_item0Entity>)purchaseback_item0Obj; purchaseback_item0QueryWrapper = (QueryWrapper<Purchaseback_item0Entity>)purchaseback_item0Obj;
purchaseback_item0Num++; purchaseback_item0Num++;
} }
Object purchaseorderObj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper,purchasebackPagination.getMenuId(),"purchaseorder")); Object purchaseorderObj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper,purchasebackPagination.getMenuId(),"jg_purchaseorder"));
if (ObjectUtil.isEmpty(purchaseorderObj)){ if (ObjectUtil.isEmpty(purchaseorderObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -100,7 +100,7 @@ public class PurchasebackServiceImpl extends ServiceImpl<PurchasebackMapper, Pur
} }
if(!isPc && appPermission){ if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object purchasebackObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackQueryWrapper,purchasebackPagination.getMenuId(),"purchaseback")); Object purchasebackObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackQueryWrapper,purchasebackPagination.getMenuId(),"jg_purchaseback"));
if (ObjectUtil.isEmpty(purchasebackObj)){ if (ObjectUtil.isEmpty(purchasebackObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -109,7 +109,7 @@ public class PurchasebackServiceImpl extends ServiceImpl<PurchasebackMapper, Pur
} }
Object purchaseback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseback_item0QueryWrapper,purchasebackPagination.getMenuId(),"purchaseback_item0")); Object purchaseback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseback_item0QueryWrapper,purchasebackPagination.getMenuId(),"jg_purchaseback_item0"));
if (ObjectUtil.isEmpty(purchaseback_item0Obj)){ if (ObjectUtil.isEmpty(purchaseback_item0Obj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -118,7 +118,7 @@ public class PurchasebackServiceImpl extends ServiceImpl<PurchasebackMapper, Pur
} }
Object purchaseorderObj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper,purchasebackPagination.getMenuId(),"purchaseorder")); Object purchaseorderObj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper,purchasebackPagination.getMenuId(),"jg_purchaseorder"));
if (ObjectUtil.isEmpty(purchaseorderObj)){ if (ObjectUtil.isEmpty(purchaseorderObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -172,26 +172,26 @@ public class PurchasebackServiceImpl extends ServiceImpl<PurchasebackMapper, Pur
QueryWrapper<Purchaseback_item0Entity> purchaseback_item0QueryWrapper=new QueryWrapper<>(); QueryWrapper<Purchaseback_item0Entity> purchaseback_item0QueryWrapper=new QueryWrapper<>();
int purchaseorderNum =0; int purchaseorderNum =0;
QueryWrapper<PurchaseorderEntity> purchaseorderQueryWrapper=new QueryWrapper<>(); QueryWrapper<PurchaseorderEntity> purchaseorderQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false; boolean pcPermission = true;
boolean appPermission = false; boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){ if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object purchasebackObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackQueryWrapper,purchasebackPagination.getMenuId(),"purchaseback")); Object purchasebackObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackQueryWrapper,purchasebackPagination.getMenuId(),"jg_purchaseback"));
if (ObjectUtil.isEmpty(purchasebackObj)){ if (ObjectUtil.isEmpty(purchasebackObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
purchasebackQueryWrapper = (QueryWrapper<PurchasebackEntity>)purchasebackObj; purchasebackQueryWrapper = (QueryWrapper<PurchasebackEntity>)purchasebackObj;
purchasebackNum++; purchasebackNum++;
} }
Object purchaseback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseback_item0QueryWrapper,purchasebackPagination.getMenuId(),"purchaseback_item0")); Object purchaseback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseback_item0QueryWrapper,purchasebackPagination.getMenuId(),"jg_purchaseback_item0"));
if (ObjectUtil.isEmpty(purchaseback_item0Obj)){ if (ObjectUtil.isEmpty(purchaseback_item0Obj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
purchaseback_item0QueryWrapper = (QueryWrapper<Purchaseback_item0Entity>)purchaseback_item0Obj; purchaseback_item0QueryWrapper = (QueryWrapper<Purchaseback_item0Entity>)purchaseback_item0Obj;
purchaseback_item0Num++; purchaseback_item0Num++;
} }
Object purchaseorderObj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper,purchasebackPagination.getMenuId(),"purchaseorder")); Object purchaseorderObj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper,purchasebackPagination.getMenuId(),"jg_purchaseorder"));
if (ObjectUtil.isEmpty(purchaseorderObj)){ if (ObjectUtil.isEmpty(purchaseorderObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -202,7 +202,7 @@ public class PurchasebackServiceImpl extends ServiceImpl<PurchasebackMapper, Pur
} }
if(!isPc && appPermission){ if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object purchasebackObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackQueryWrapper,purchasebackPagination.getMenuId(),"purchaseback")); Object purchasebackObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackQueryWrapper,purchasebackPagination.getMenuId(),"jg_purchaseback"));
if (ObjectUtil.isEmpty(purchasebackObj)){ if (ObjectUtil.isEmpty(purchasebackObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -211,7 +211,7 @@ public class PurchasebackServiceImpl extends ServiceImpl<PurchasebackMapper, Pur
} }
Object purchaseback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseback_item0QueryWrapper,purchasebackPagination.getMenuId(),"purchaseback_item0")); Object purchaseback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseback_item0QueryWrapper,purchasebackPagination.getMenuId(),"jg_purchaseback_item0"));
if (ObjectUtil.isEmpty(purchaseback_item0Obj)){ if (ObjectUtil.isEmpty(purchaseback_item0Obj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -220,7 +220,7 @@ public class PurchasebackServiceImpl extends ServiceImpl<PurchasebackMapper, Pur
} }
Object purchaseorderObj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper,purchasebackPagination.getMenuId(),"purchaseorder")); Object purchaseorderObj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper,purchasebackPagination.getMenuId(),"jg_purchaseorder"));
if (ObjectUtil.isEmpty(purchaseorderObj)){ if (ObjectUtil.isEmpty(purchaseorderObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {

@ -678,47 +678,47 @@ if (pMap!=null&&pMap.size()>0){
QueryWrapper<PaymentitemEntity> paymentitemQueryWrapper=new QueryWrapper<>(); QueryWrapper<PaymentitemEntity> paymentitemQueryWrapper=new QueryWrapper<>();
int collectionitemNum =0; int collectionitemNum =0;
QueryWrapper<CollectionpoEntity> collectionitemQueryWrapper=new QueryWrapper<>(); QueryWrapper<CollectionpoEntity> collectionitemQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false; boolean pcPermission = true;
boolean appPermission = false; boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){ if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object purchaseorderObj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper,purchaseorderPagination.getMenuId(),"purchaseorder")); Object purchaseorderObj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper,purchaseorderPagination.getMenuId(),"jg_purchaseorder"));
if (ObjectUtil.isEmpty(purchaseorderObj)){ if (ObjectUtil.isEmpty(purchaseorderObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
purchaseorderQueryWrapper = (QueryWrapper<PurchaseorderitemEntity>)purchaseorderObj; purchaseorderQueryWrapper = (QueryWrapper<PurchaseorderitemEntity>)purchaseorderObj;
purchaseorderNum++; purchaseorderNum++;
} }
Object purchaseorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorder_item0QueryWrapper,purchaseorderPagination.getMenuId(),"purchaseorder_item0")); Object purchaseorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorder_item0QueryWrapper,purchaseorderPagination.getMenuId(),"jg_purchaseorder_item0"));
if (ObjectUtil.isEmpty(purchaseorder_item0Obj)){ if (ObjectUtil.isEmpty(purchaseorder_item0Obj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
purchaseorder_item0QueryWrapper = (QueryWrapper<Purchaseorder_item0Entity>)purchaseorder_item0Obj; purchaseorder_item0QueryWrapper = (QueryWrapper<Purchaseorder_item0Entity>)purchaseorder_item0Obj;
purchaseorder_item0Num++; purchaseorder_item0Num++;
} }
Object purchasebackitemObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackitemQueryWrapper,purchaseorderPagination.getMenuId(),"purchasebackitem")); Object purchasebackitemObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackitemQueryWrapper,purchaseorderPagination.getMenuId(),"jg_purchasebackitem"));
if (ObjectUtil.isEmpty(purchasebackitemObj)){ if (ObjectUtil.isEmpty(purchasebackitemObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
purchasebackitemQueryWrapper = (QueryWrapper<PurchasebackitemEntity>)purchasebackitemObj; purchasebackitemQueryWrapper = (QueryWrapper<PurchasebackitemEntity>)purchasebackitemObj;
purchasebackitemNum++; purchasebackitemNum++;
} }
Object invoices_item0itemObj=authorizeService.getCondition(new AuthorizeConditionModel(invoices_item0itemQueryWrapper,purchaseorderPagination.getMenuId(),"invoices_item0item")); Object invoices_item0itemObj=authorizeService.getCondition(new AuthorizeConditionModel(invoices_item0itemQueryWrapper,purchaseorderPagination.getMenuId(),"jg_invoices_item0item"));
if (ObjectUtil.isEmpty(invoices_item0itemObj)){ if (ObjectUtil.isEmpty(invoices_item0itemObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
invoices_item0itemQueryWrapper = (QueryWrapper<Invoices_item0itemEntity>)invoices_item0itemObj; invoices_item0itemQueryWrapper = (QueryWrapper<Invoices_item0itemEntity>)invoices_item0itemObj;
invoices_item0itemNum++; invoices_item0itemNum++;
} }
Object paymentitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentitemQueryWrapper,purchaseorderPagination.getMenuId(),"paymentitem")); Object paymentitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentitemQueryWrapper,purchaseorderPagination.getMenuId(),"jg_paymentitem"));
if (ObjectUtil.isEmpty(paymentitemObj)){ if (ObjectUtil.isEmpty(paymentitemObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
paymentitemQueryWrapper = (QueryWrapper<PaymentitemEntity>)paymentitemObj; paymentitemQueryWrapper = (QueryWrapper<PaymentitemEntity>)paymentitemObj;
paymentitemNum++; paymentitemNum++;
} }
Object collectionitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionitemQueryWrapper,purchaseorderPagination.getMenuId(),"collectionitem")); Object collectionitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionitemQueryWrapper,purchaseorderPagination.getMenuId(),"jg_collectionitem"));
if (ObjectUtil.isEmpty(collectionitemObj)){ if (ObjectUtil.isEmpty(collectionitemObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -729,7 +729,7 @@ if (pMap!=null&&pMap.size()>0){
} }
if(!isPc && appPermission){ if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object purchaseorderObj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper,purchaseorderPagination.getMenuId(),"purchaseorder")); Object purchaseorderObj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper,purchaseorderPagination.getMenuId(),"jg_purchaseorder"));
if (ObjectUtil.isEmpty(purchaseorderObj)){ if (ObjectUtil.isEmpty(purchaseorderObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -738,7 +738,7 @@ if (pMap!=null&&pMap.size()>0){
} }
Object purchaseorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorder_item0QueryWrapper,purchaseorderPagination.getMenuId(),"purchaseorder_item0")); Object purchaseorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorder_item0QueryWrapper,purchaseorderPagination.getMenuId(),"jg_purchaseorder_item0"));
if (ObjectUtil.isEmpty(purchaseorder_item0Obj)){ if (ObjectUtil.isEmpty(purchaseorder_item0Obj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -747,7 +747,7 @@ if (pMap!=null&&pMap.size()>0){
} }
Object purchasebackitemObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackitemQueryWrapper,purchaseorderPagination.getMenuId(),"purchasebackitem")); Object purchasebackitemObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackitemQueryWrapper,purchaseorderPagination.getMenuId(),"jg_purchasebackitem"));
if (ObjectUtil.isEmpty(purchasebackitemObj)){ if (ObjectUtil.isEmpty(purchasebackitemObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -756,7 +756,7 @@ if (pMap!=null&&pMap.size()>0){
} }
Object invoices_item0itemObj=authorizeService.getCondition(new AuthorizeConditionModel(invoices_item0itemQueryWrapper,purchaseorderPagination.getMenuId(),"invoices_item0item")); Object invoices_item0itemObj=authorizeService.getCondition(new AuthorizeConditionModel(invoices_item0itemQueryWrapper,purchaseorderPagination.getMenuId(),"jg_invoices_item0item"));
if (ObjectUtil.isEmpty(invoices_item0itemObj)){ if (ObjectUtil.isEmpty(invoices_item0itemObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -765,7 +765,7 @@ if (pMap!=null&&pMap.size()>0){
} }
Object paymentitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentitemQueryWrapper,purchaseorderPagination.getMenuId(),"paymentitem")); Object paymentitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentitemQueryWrapper,purchaseorderPagination.getMenuId(),"jg_paymentitem"));
if (ObjectUtil.isEmpty(paymentitemObj)){ if (ObjectUtil.isEmpty(paymentitemObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -774,7 +774,7 @@ if (pMap!=null&&pMap.size()>0){
} }
Object collectionitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionitemQueryWrapper,purchaseorderPagination.getMenuId(),"collectionitem")); Object collectionitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionitemQueryWrapper,purchaseorderPagination.getMenuId(),"jg_collectionitem"));
if (ObjectUtil.isEmpty(collectionitemObj)){ if (ObjectUtil.isEmpty(collectionitemObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -834,47 +834,47 @@ if (pMap!=null&&pMap.size()>0){
QueryWrapper<PaymentitemEntity> paymentitemQueryWrapper=new QueryWrapper<>(); QueryWrapper<PaymentitemEntity> paymentitemQueryWrapper=new QueryWrapper<>();
int collectionitemNum =0; int collectionitemNum =0;
QueryWrapper<CollectionpoEntity> collectionitemQueryWrapper=new QueryWrapper<>(); QueryWrapper<CollectionpoEntity> collectionitemQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false; boolean pcPermission = true;
boolean appPermission = false; boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){ if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object purchaseorderObj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper,purchaseorderPagination.getMenuId(),"purchaseorder")); Object purchaseorderObj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper,purchaseorderPagination.getMenuId(),"jg_purchaseorder"));
if (ObjectUtil.isEmpty(purchaseorderObj)){ if (ObjectUtil.isEmpty(purchaseorderObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
purchaseorderQueryWrapper = (QueryWrapper<PurchaseorderitemEntity>)purchaseorderObj; purchaseorderQueryWrapper = (QueryWrapper<PurchaseorderitemEntity>)purchaseorderObj;
purchaseorderNum++; purchaseorderNum++;
} }
Object purchaseorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorder_item0QueryWrapper,purchaseorderPagination.getMenuId(),"purchaseorder_item0")); Object purchaseorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorder_item0QueryWrapper,purchaseorderPagination.getMenuId(),"jg_purchaseorder_item0"));
if (ObjectUtil.isEmpty(purchaseorder_item0Obj)){ if (ObjectUtil.isEmpty(purchaseorder_item0Obj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
purchaseorder_item0QueryWrapper = (QueryWrapper<Purchaseorder_item0Entity>)purchaseorder_item0Obj; purchaseorder_item0QueryWrapper = (QueryWrapper<Purchaseorder_item0Entity>)purchaseorder_item0Obj;
purchaseorder_item0Num++; purchaseorder_item0Num++;
} }
Object purchasebackitemObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackitemQueryWrapper,purchaseorderPagination.getMenuId(),"purchasebackitem")); Object purchasebackitemObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackitemQueryWrapper,purchaseorderPagination.getMenuId(),"jg_purchasebackitem"));
if (ObjectUtil.isEmpty(purchasebackitemObj)){ if (ObjectUtil.isEmpty(purchasebackitemObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
purchasebackitemQueryWrapper = (QueryWrapper<PurchasebackitemEntity>)purchasebackitemObj; purchasebackitemQueryWrapper = (QueryWrapper<PurchasebackitemEntity>)purchasebackitemObj;
purchasebackitemNum++; purchasebackitemNum++;
} }
Object invoices_item0itemObj=authorizeService.getCondition(new AuthorizeConditionModel(invoices_item0itemQueryWrapper,purchaseorderPagination.getMenuId(),"invoices_item0item")); Object invoices_item0itemObj=authorizeService.getCondition(new AuthorizeConditionModel(invoices_item0itemQueryWrapper,purchaseorderPagination.getMenuId(),"jg_invoices_item0item"));
if (ObjectUtil.isEmpty(invoices_item0itemObj)){ if (ObjectUtil.isEmpty(invoices_item0itemObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
invoices_item0itemQueryWrapper = (QueryWrapper<Invoices_item0itemEntity>)invoices_item0itemObj; invoices_item0itemQueryWrapper = (QueryWrapper<Invoices_item0itemEntity>)invoices_item0itemObj;
invoices_item0itemNum++; invoices_item0itemNum++;
} }
Object paymentitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentitemQueryWrapper,purchaseorderPagination.getMenuId(),"paymentitem")); Object paymentitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentitemQueryWrapper,purchaseorderPagination.getMenuId(),"jg_paymentitem"));
if (ObjectUtil.isEmpty(paymentitemObj)){ if (ObjectUtil.isEmpty(paymentitemObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
paymentitemQueryWrapper = (QueryWrapper<PaymentitemEntity>)paymentitemObj; paymentitemQueryWrapper = (QueryWrapper<PaymentitemEntity>)paymentitemObj;
paymentitemNum++; paymentitemNum++;
} }
Object collectionitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionitemQueryWrapper,purchaseorderPagination.getMenuId(),"collectionitem")); Object collectionitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionitemQueryWrapper,purchaseorderPagination.getMenuId(),"jg_collectionitem"));
if (ObjectUtil.isEmpty(collectionitemObj)){ if (ObjectUtil.isEmpty(collectionitemObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -885,7 +885,7 @@ if (pMap!=null&&pMap.size()>0){
} }
if(!isPc && appPermission){ if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object purchaseorderObj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper,purchaseorderPagination.getMenuId(),"purchaseorder")); Object purchaseorderObj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper,purchaseorderPagination.getMenuId(),"jg_purchaseorder"));
if (ObjectUtil.isEmpty(purchaseorderObj)){ if (ObjectUtil.isEmpty(purchaseorderObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -894,7 +894,7 @@ if (pMap!=null&&pMap.size()>0){
} }
Object purchaseorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorder_item0QueryWrapper,purchaseorderPagination.getMenuId(),"purchaseorder_item0")); Object purchaseorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorder_item0QueryWrapper,purchaseorderPagination.getMenuId(),"jg_purchaseorder_item0"));
if (ObjectUtil.isEmpty(purchaseorder_item0Obj)){ if (ObjectUtil.isEmpty(purchaseorder_item0Obj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -903,7 +903,7 @@ if (pMap!=null&&pMap.size()>0){
} }
Object purchasebackitemObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackitemQueryWrapper,purchaseorderPagination.getMenuId(),"purchasebackitem")); Object purchasebackitemObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackitemQueryWrapper,purchaseorderPagination.getMenuId(),"jg_purchasebackitem"));
if (ObjectUtil.isEmpty(purchasebackitemObj)){ if (ObjectUtil.isEmpty(purchasebackitemObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -912,7 +912,7 @@ if (pMap!=null&&pMap.size()>0){
} }
Object invoices_item0itemObj=authorizeService.getCondition(new AuthorizeConditionModel(invoices_item0itemQueryWrapper,purchaseorderPagination.getMenuId(),"invoices_item0item")); Object invoices_item0itemObj=authorizeService.getCondition(new AuthorizeConditionModel(invoices_item0itemQueryWrapper,purchaseorderPagination.getMenuId(),"jg_invoices_item0item"));
if (ObjectUtil.isEmpty(invoices_item0itemObj)){ if (ObjectUtil.isEmpty(invoices_item0itemObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -921,7 +921,7 @@ if (pMap!=null&&pMap.size()>0){
} }
Object paymentitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentitemQueryWrapper,purchaseorderPagination.getMenuId(),"paymentitem")); Object paymentitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentitemQueryWrapper,purchaseorderPagination.getMenuId(),"jg_paymentitem"));
if (ObjectUtil.isEmpty(paymentitemObj)){ if (ObjectUtil.isEmpty(paymentitemObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -930,7 +930,7 @@ if (pMap!=null&&pMap.size()>0){
} }
Object collectionitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionitemQueryWrapper,purchaseorderPagination.getMenuId(),"collectionitem")); Object collectionitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionitemQueryWrapper,purchaseorderPagination.getMenuId(),"jg_collectionitem"));
if (ObjectUtil.isEmpty(collectionitemObj)){ if (ObjectUtil.isEmpty(collectionitemObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {

@ -66,19 +66,19 @@ public class ReceiptinServiceImpl extends ServiceImpl<ReceiptinMapper, Receiptin
QueryWrapper<ReceiptinEntity> receiptinQueryWrapper=new QueryWrapper<>(); QueryWrapper<ReceiptinEntity> receiptinQueryWrapper=new QueryWrapper<>();
int receiptin_item0Num =0; int receiptin_item0Num =0;
QueryWrapper<Receiptin_item0Entity> receiptin_item0QueryWrapper=new QueryWrapper<>(); QueryWrapper<Receiptin_item0Entity> receiptin_item0QueryWrapper=new QueryWrapper<>();
boolean pcPermission = false; boolean pcPermission = true;
boolean appPermission = false; boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){ if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object receiptinObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptinQueryWrapper,receiptinPagination.getMenuId(),"receiptin")); Object receiptinObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptinQueryWrapper,receiptinPagination.getMenuId(),"jg_receiptin"));
if (ObjectUtil.isEmpty(receiptinObj)){ if (ObjectUtil.isEmpty(receiptinObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
receiptinQueryWrapper = (QueryWrapper<ReceiptinEntity>)receiptinObj; receiptinQueryWrapper = (QueryWrapper<ReceiptinEntity>)receiptinObj;
receiptinNum++; receiptinNum++;
} }
Object receiptin_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(receiptin_item0QueryWrapper,receiptinPagination.getMenuId(),"receiptin_item0")); Object receiptin_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(receiptin_item0QueryWrapper,receiptinPagination.getMenuId(),"jg_receiptin_item0"));
if (ObjectUtil.isEmpty(receiptin_item0Obj)){ if (ObjectUtil.isEmpty(receiptin_item0Obj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -89,7 +89,7 @@ public class ReceiptinServiceImpl extends ServiceImpl<ReceiptinMapper, Receiptin
} }
if(!isPc && appPermission){ if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object receiptinObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptinQueryWrapper,receiptinPagination.getMenuId(),"receiptin")); Object receiptinObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptinQueryWrapper,receiptinPagination.getMenuId(),"jg_receiptin"));
if (ObjectUtil.isEmpty(receiptinObj)){ if (ObjectUtil.isEmpty(receiptinObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -98,7 +98,7 @@ public class ReceiptinServiceImpl extends ServiceImpl<ReceiptinMapper, Receiptin
} }
Object receiptin_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(receiptin_item0QueryWrapper,receiptinPagination.getMenuId(),"receiptin_item0")); Object receiptin_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(receiptin_item0QueryWrapper,receiptinPagination.getMenuId(),"jg_receiptin_item0"));
if (ObjectUtil.isEmpty(receiptin_item0Obj)){ if (ObjectUtil.isEmpty(receiptin_item0Obj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -155,19 +155,19 @@ public class ReceiptinServiceImpl extends ServiceImpl<ReceiptinMapper, Receiptin
QueryWrapper<ReceiptinEntity> receiptinQueryWrapper=new QueryWrapper<>(); QueryWrapper<ReceiptinEntity> receiptinQueryWrapper=new QueryWrapper<>();
int receiptin_item0Num =0; int receiptin_item0Num =0;
QueryWrapper<Receiptin_item0Entity> receiptin_item0QueryWrapper=new QueryWrapper<>(); QueryWrapper<Receiptin_item0Entity> receiptin_item0QueryWrapper=new QueryWrapper<>();
boolean pcPermission = false; boolean pcPermission = true;
boolean appPermission = false; boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){ if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object receiptinObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptinQueryWrapper,receiptinPagination.getMenuId(),"receiptin")); Object receiptinObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptinQueryWrapper,receiptinPagination.getMenuId(),"jg_receiptin"));
if (ObjectUtil.isEmpty(receiptinObj)){ if (ObjectUtil.isEmpty(receiptinObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
receiptinQueryWrapper = (QueryWrapper<ReceiptinEntity>)receiptinObj; receiptinQueryWrapper = (QueryWrapper<ReceiptinEntity>)receiptinObj;
receiptinNum++; receiptinNum++;
} }
Object receiptin_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(receiptin_item0QueryWrapper,receiptinPagination.getMenuId(),"receiptin_item0")); Object receiptin_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(receiptin_item0QueryWrapper,receiptinPagination.getMenuId(),"jg_receiptin_item0"));
if (ObjectUtil.isEmpty(receiptin_item0Obj)){ if (ObjectUtil.isEmpty(receiptin_item0Obj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -178,7 +178,7 @@ public class ReceiptinServiceImpl extends ServiceImpl<ReceiptinMapper, Receiptin
} }
if(!isPc && appPermission){ if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object receiptinObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptinQueryWrapper,receiptinPagination.getMenuId(),"receiptin")); Object receiptinObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptinQueryWrapper,receiptinPagination.getMenuId(),"jg_receiptin"));
if (ObjectUtil.isEmpty(receiptinObj)){ if (ObjectUtil.isEmpty(receiptinObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -187,7 +187,7 @@ public class ReceiptinServiceImpl extends ServiceImpl<ReceiptinMapper, Receiptin
} }
Object receiptin_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(receiptin_item0QueryWrapper,receiptinPagination.getMenuId(),"receiptin_item0")); Object receiptin_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(receiptin_item0QueryWrapper,receiptinPagination.getMenuId(),"jg_receiptin_item0"));
if (ObjectUtil.isEmpty(receiptin_item0Obj)){ if (ObjectUtil.isEmpty(receiptin_item0Obj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {

@ -66,19 +66,19 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
QueryWrapper<ReceiptoutEntity> receiptoutQueryWrapper=new QueryWrapper<>(); QueryWrapper<ReceiptoutEntity> receiptoutQueryWrapper=new QueryWrapper<>();
int receiptout_item0Num =0; int receiptout_item0Num =0;
QueryWrapper<Receiptout_item0Entity> receiptout_item0QueryWrapper=new QueryWrapper<>(); QueryWrapper<Receiptout_item0Entity> receiptout_item0QueryWrapper=new QueryWrapper<>();
boolean pcPermission = false; boolean pcPermission = true;
boolean appPermission = false; boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){ if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object receiptoutObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutQueryWrapper,receiptoutPagination.getMenuId(),"receiptout")); Object receiptoutObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutQueryWrapper,receiptoutPagination.getMenuId(),"jg_receiptout"));
if (ObjectUtil.isEmpty(receiptoutObj)){ if (ObjectUtil.isEmpty(receiptoutObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
receiptoutQueryWrapper = (QueryWrapper<ReceiptoutEntity>)receiptoutObj; receiptoutQueryWrapper = (QueryWrapper<ReceiptoutEntity>)receiptoutObj;
receiptoutNum++; receiptoutNum++;
} }
Object receiptout_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(receiptout_item0QueryWrapper,receiptoutPagination.getMenuId(),"receiptout_item0")); Object receiptout_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(receiptout_item0QueryWrapper,receiptoutPagination.getMenuId(),"jg_receiptout_item0"));
if (ObjectUtil.isEmpty(receiptout_item0Obj)){ if (ObjectUtil.isEmpty(receiptout_item0Obj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -89,7 +89,7 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
} }
if(!isPc && appPermission){ if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object receiptoutObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutQueryWrapper,receiptoutPagination.getMenuId(),"receiptout")); Object receiptoutObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutQueryWrapper,receiptoutPagination.getMenuId(),"jg_receiptout"));
if (ObjectUtil.isEmpty(receiptoutObj)){ if (ObjectUtil.isEmpty(receiptoutObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -98,7 +98,7 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
} }
Object receiptout_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(receiptout_item0QueryWrapper,receiptoutPagination.getMenuId(),"receiptout_item0")); Object receiptout_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(receiptout_item0QueryWrapper,receiptoutPagination.getMenuId(),"jg_receiptout_item0"));
if (ObjectUtil.isEmpty(receiptout_item0Obj)){ if (ObjectUtil.isEmpty(receiptout_item0Obj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -160,19 +160,19 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
QueryWrapper<ReceiptoutEntity> receiptoutQueryWrapper=new QueryWrapper<>(); QueryWrapper<ReceiptoutEntity> receiptoutQueryWrapper=new QueryWrapper<>();
int receiptout_item0Num =0; int receiptout_item0Num =0;
QueryWrapper<Receiptout_item0Entity> receiptout_item0QueryWrapper=new QueryWrapper<>(); QueryWrapper<Receiptout_item0Entity> receiptout_item0QueryWrapper=new QueryWrapper<>();
boolean pcPermission = false; boolean pcPermission = true;
boolean appPermission = false; boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){ if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object receiptoutObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutQueryWrapper,receiptoutPagination.getMenuId(),"receiptout")); Object receiptoutObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutQueryWrapper,receiptoutPagination.getMenuId(),"jg_receiptout"));
if (ObjectUtil.isEmpty(receiptoutObj)){ if (ObjectUtil.isEmpty(receiptoutObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
receiptoutQueryWrapper = (QueryWrapper<ReceiptoutEntity>)receiptoutObj; receiptoutQueryWrapper = (QueryWrapper<ReceiptoutEntity>)receiptoutObj;
receiptoutNum++; receiptoutNum++;
} }
Object receiptout_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(receiptout_item0QueryWrapper,receiptoutPagination.getMenuId(),"receiptout_item0")); Object receiptout_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(receiptout_item0QueryWrapper,receiptoutPagination.getMenuId(),"jg_receiptout_item0"));
if (ObjectUtil.isEmpty(receiptout_item0Obj)){ if (ObjectUtil.isEmpty(receiptout_item0Obj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -183,7 +183,7 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
} }
if(!isPc && appPermission){ if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object receiptoutObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutQueryWrapper,receiptoutPagination.getMenuId(),"receiptout")); Object receiptoutObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutQueryWrapper,receiptoutPagination.getMenuId(),"jg_receiptout"));
if (ObjectUtil.isEmpty(receiptoutObj)){ if (ObjectUtil.isEmpty(receiptoutObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -192,7 +192,7 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
} }
Object receiptout_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(receiptout_item0QueryWrapper,receiptoutPagination.getMenuId(),"receiptout_item0")); Object receiptout_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(receiptout_item0QueryWrapper,receiptoutPagination.getMenuId(),"jg_receiptout_item0"));
if (ObjectUtil.isEmpty(receiptout_item0Obj)){ if (ObjectUtil.isEmpty(receiptout_item0Obj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {

@ -51,12 +51,12 @@ public class ReservoirareaServiceImpl extends ServiceImpl<ReservoirareaMapper, R
int total=0; int total=0;
int reservoirareaNum =0; int reservoirareaNum =0;
QueryWrapper<ReservoirareaEntity> reservoirareaQueryWrapper=new QueryWrapper<>(); QueryWrapper<ReservoirareaEntity> reservoirareaQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false; boolean pcPermission = true;
boolean appPermission = false; boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){ if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object reservoirareaObj=authorizeService.getCondition(new AuthorizeConditionModel(reservoirareaQueryWrapper,reservoirareaPagination.getMenuId(),"reservoirarea")); Object reservoirareaObj=authorizeService.getCondition(new AuthorizeConditionModel(reservoirareaQueryWrapper,reservoirareaPagination.getMenuId(),"jg_reservoirarea"));
if (ObjectUtil.isEmpty(reservoirareaObj)){ if (ObjectUtil.isEmpty(reservoirareaObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -67,7 +67,7 @@ public class ReservoirareaServiceImpl extends ServiceImpl<ReservoirareaMapper, R
} }
if(!isPc && appPermission){ if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object reservoirareaObj=authorizeService.getCondition(new AuthorizeConditionModel(reservoirareaQueryWrapper,reservoirareaPagination.getMenuId(),"reservoirarea")); Object reservoirareaObj=authorizeService.getCondition(new AuthorizeConditionModel(reservoirareaQueryWrapper,reservoirareaPagination.getMenuId(),"jg_reservoirarea"));
if (ObjectUtil.isEmpty(reservoirareaObj)){ if (ObjectUtil.isEmpty(reservoirareaObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -122,12 +122,12 @@ public class ReservoirareaServiceImpl extends ServiceImpl<ReservoirareaMapper, R
int total=0; int total=0;
int reservoirareaNum =0; int reservoirareaNum =0;
QueryWrapper<ReservoirareaEntity> reservoirareaQueryWrapper=new QueryWrapper<>(); QueryWrapper<ReservoirareaEntity> reservoirareaQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false; boolean pcPermission = true;
boolean appPermission = false; boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){ if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object reservoirareaObj=authorizeService.getCondition(new AuthorizeConditionModel(reservoirareaQueryWrapper,reservoirareaPagination.getMenuId(),"reservoirarea")); Object reservoirareaObj=authorizeService.getCondition(new AuthorizeConditionModel(reservoirareaQueryWrapper,reservoirareaPagination.getMenuId(),"jg_reservoirarea"));
if (ObjectUtil.isEmpty(reservoirareaObj)){ if (ObjectUtil.isEmpty(reservoirareaObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -138,7 +138,7 @@ public class ReservoirareaServiceImpl extends ServiceImpl<ReservoirareaMapper, R
} }
if(!isPc && appPermission){ if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object reservoirareaObj=authorizeService.getCondition(new AuthorizeConditionModel(reservoirareaQueryWrapper,reservoirareaPagination.getMenuId(),"reservoirarea")); Object reservoirareaObj=authorizeService.getCondition(new AuthorizeConditionModel(reservoirareaQueryWrapper,reservoirareaPagination.getMenuId(),"jg_reservoirarea"));
if (ObjectUtil.isEmpty(reservoirareaObj)){ if (ObjectUtil.isEmpty(reservoirareaObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {

@ -70,26 +70,26 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
QueryWrapper<Saleback_item0Entity> saleback_item0QueryWrapper=new QueryWrapper<>(); QueryWrapper<Saleback_item0Entity> saleback_item0QueryWrapper=new QueryWrapper<>();
int saleorderNum =0; int saleorderNum =0;
QueryWrapper<SaleorderEntity> saleorderQueryWrapper=new QueryWrapper<>(); QueryWrapper<SaleorderEntity> saleorderQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false; boolean pcPermission = true;
boolean appPermission = false; boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){ if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object salebackObj=authorizeService.getCondition(new AuthorizeConditionModel(salebackQueryWrapper,salebackPagination.getMenuId(),"saleback")); Object salebackObj=authorizeService.getCondition(new AuthorizeConditionModel(salebackQueryWrapper,salebackPagination.getMenuId(),"jg_saleback"));
if (ObjectUtil.isEmpty(salebackObj)){ if (ObjectUtil.isEmpty(salebackObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
salebackQueryWrapper = (QueryWrapper<SalebackEntity>)salebackObj; salebackQueryWrapper = (QueryWrapper<SalebackEntity>)salebackObj;
salebackNum++; salebackNum++;
} }
Object saleback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(saleback_item0QueryWrapper,salebackPagination.getMenuId(),"saleback_item0")); Object saleback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(saleback_item0QueryWrapper,salebackPagination.getMenuId(),"jg_saleback_item0"));
if (ObjectUtil.isEmpty(saleback_item0Obj)){ if (ObjectUtil.isEmpty(saleback_item0Obj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
saleback_item0QueryWrapper = (QueryWrapper<Saleback_item0Entity>)saleback_item0Obj; saleback_item0QueryWrapper = (QueryWrapper<Saleback_item0Entity>)saleback_item0Obj;
saleback_item0Num++; saleback_item0Num++;
} }
Object saleorderObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderQueryWrapper,salebackPagination.getMenuId(),"saleorder")); Object saleorderObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderQueryWrapper,salebackPagination.getMenuId(),"jg_saleorder"));
if (ObjectUtil.isEmpty(saleorderObj)){ if (ObjectUtil.isEmpty(saleorderObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -100,7 +100,7 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
} }
if(!isPc && appPermission){ if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object salebackObj=authorizeService.getCondition(new AuthorizeConditionModel(salebackQueryWrapper,salebackPagination.getMenuId(),"saleback")); Object salebackObj=authorizeService.getCondition(new AuthorizeConditionModel(salebackQueryWrapper,salebackPagination.getMenuId(),"jg_saleback"));
if (ObjectUtil.isEmpty(salebackObj)){ if (ObjectUtil.isEmpty(salebackObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -109,7 +109,7 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
} }
Object saleback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(saleback_item0QueryWrapper,salebackPagination.getMenuId(),"saleback_item0")); Object saleback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(saleback_item0QueryWrapper,salebackPagination.getMenuId(),"jg_saleback_item0"));
if (ObjectUtil.isEmpty(saleback_item0Obj)){ if (ObjectUtil.isEmpty(saleback_item0Obj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -118,7 +118,7 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
} }
Object saleorderObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderQueryWrapper,salebackPagination.getMenuId(),"saleorder")); Object saleorderObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderQueryWrapper,salebackPagination.getMenuId(),"jg_saleorder"));
if (ObjectUtil.isEmpty(saleorderObj)){ if (ObjectUtil.isEmpty(saleorderObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -172,26 +172,26 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
QueryWrapper<Saleback_item0Entity> saleback_item0QueryWrapper=new QueryWrapper<>(); QueryWrapper<Saleback_item0Entity> saleback_item0QueryWrapper=new QueryWrapper<>();
int saleorderNum =0; int saleorderNum =0;
QueryWrapper<SaleorderEntity> saleorderQueryWrapper=new QueryWrapper<>(); QueryWrapper<SaleorderEntity> saleorderQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false; boolean pcPermission = true;
boolean appPermission = false; boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){ if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object salebackObj=authorizeService.getCondition(new AuthorizeConditionModel(salebackQueryWrapper,salebackPagination.getMenuId(),"saleback")); Object salebackObj=authorizeService.getCondition(new AuthorizeConditionModel(salebackQueryWrapper,salebackPagination.getMenuId(),"jg_saleback"));
if (ObjectUtil.isEmpty(salebackObj)){ if (ObjectUtil.isEmpty(salebackObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
salebackQueryWrapper = (QueryWrapper<SalebackEntity>)salebackObj; salebackQueryWrapper = (QueryWrapper<SalebackEntity>)salebackObj;
salebackNum++; salebackNum++;
} }
Object saleback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(saleback_item0QueryWrapper,salebackPagination.getMenuId(),"saleback_item0")); Object saleback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(saleback_item0QueryWrapper,salebackPagination.getMenuId(),"jg_saleback_item0"));
if (ObjectUtil.isEmpty(saleback_item0Obj)){ if (ObjectUtil.isEmpty(saleback_item0Obj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
saleback_item0QueryWrapper = (QueryWrapper<Saleback_item0Entity>)saleback_item0Obj; saleback_item0QueryWrapper = (QueryWrapper<Saleback_item0Entity>)saleback_item0Obj;
saleback_item0Num++; saleback_item0Num++;
} }
Object saleorderObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderQueryWrapper,salebackPagination.getMenuId(),"saleorder")); Object saleorderObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderQueryWrapper,salebackPagination.getMenuId(),"jg_saleorder"));
if (ObjectUtil.isEmpty(saleorderObj)){ if (ObjectUtil.isEmpty(saleorderObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -202,7 +202,7 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
} }
if(!isPc && appPermission){ if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object salebackObj=authorizeService.getCondition(new AuthorizeConditionModel(salebackQueryWrapper,salebackPagination.getMenuId(),"saleback")); Object salebackObj=authorizeService.getCondition(new AuthorizeConditionModel(salebackQueryWrapper,salebackPagination.getMenuId(),"jg_saleback"));
if (ObjectUtil.isEmpty(salebackObj)){ if (ObjectUtil.isEmpty(salebackObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -211,7 +211,7 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
} }
Object saleback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(saleback_item0QueryWrapper,salebackPagination.getMenuId(),"saleback_item0")); Object saleback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(saleback_item0QueryWrapper,salebackPagination.getMenuId(),"jg_saleback_item0"));
if (ObjectUtil.isEmpty(saleback_item0Obj)){ if (ObjectUtil.isEmpty(saleback_item0Obj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -220,7 +220,7 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
} }
Object saleorderObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderQueryWrapper,salebackPagination.getMenuId(),"saleorder")); Object saleorderObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderQueryWrapper,salebackPagination.getMenuId(),"jg_saleorder"));
if (ObjectUtil.isEmpty(saleorderObj)){ if (ObjectUtil.isEmpty(saleorderObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {

@ -82,54 +82,54 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
QueryWrapper<PaymentsoitemEntity> paymentsoitemQueryWrapper=new QueryWrapper<>(); QueryWrapper<PaymentsoitemEntity> paymentsoitemQueryWrapper=new QueryWrapper<>();
int arinvoices_item0soitemNum =0; int arinvoices_item0soitemNum =0;
QueryWrapper<Arinvoices_item0soitemEntity> arinvoices_item0soitemQueryWrapper=new QueryWrapper<>(); QueryWrapper<Arinvoices_item0soitemEntity> arinvoices_item0soitemQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false; boolean pcPermission = true;
boolean appPermission = false; boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){ if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object saleorderObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderQueryWrapper,saleorderPagination.getMenuId(),"saleorder")); Object saleorderObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderQueryWrapper,saleorderPagination.getMenuId(),"jg_saleorder"));
if (ObjectUtil.isEmpty(saleorderObj)){ if (ObjectUtil.isEmpty(saleorderObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
saleorderQueryWrapper = (QueryWrapper<SaleorderitemEntity>)saleorderObj; saleorderQueryWrapper = (QueryWrapper<SaleorderitemEntity>)saleorderObj;
saleorderNum++; saleorderNum++;
} }
Object salesorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(salesorder_item0QueryWrapper,saleorderPagination.getMenuId(),"salesorder_item0")); Object salesorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(salesorder_item0QueryWrapper,saleorderPagination.getMenuId(),"jg_salesorder_item0"));
if (ObjectUtil.isEmpty(salesorder_item0Obj)){ if (ObjectUtil.isEmpty(salesorder_item0Obj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
salesorder_item0QueryWrapper = (QueryWrapper<Salesorder_item0Entity>)salesorder_item0Obj; salesorder_item0QueryWrapper = (QueryWrapper<Salesorder_item0Entity>)salesorder_item0Obj;
salesorder_item0Num++; salesorder_item0Num++;
} }
Object receiptoutsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutsoitemQueryWrapper,saleorderPagination.getMenuId(),"receiptoutsoitem")); Object receiptoutsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutsoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_receiptoutsoitem"));
if (ObjectUtil.isEmpty(receiptoutsoitemObj)){ if (ObjectUtil.isEmpty(receiptoutsoitemObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
receiptoutsoitemQueryWrapper = (QueryWrapper<ReceiptoutsoitemEntity>)receiptoutsoitemObj; receiptoutsoitemQueryWrapper = (QueryWrapper<ReceiptoutsoitemEntity>)receiptoutsoitemObj;
receiptoutsoitemNum++; receiptoutsoitemNum++;
} }
Object collectionsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionsoitemQueryWrapper,saleorderPagination.getMenuId(),"collectionsoitem")); Object collectionsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionsoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_collectionsoitem"));
if (ObjectUtil.isEmpty(collectionsoitemObj)){ if (ObjectUtil.isEmpty(collectionsoitemObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
collectionsoitemQueryWrapper = (QueryWrapper<CollectionsoitemEntity>)collectionsoitemObj; collectionsoitemQueryWrapper = (QueryWrapper<CollectionsoitemEntity>)collectionsoitemObj;
collectionsoitemNum++; collectionsoitemNum++;
} }
Object salesbacksoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(salesbacksoitemQueryWrapper,saleorderPagination.getMenuId(),"salesbacksoitem")); Object salesbacksoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(salesbacksoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_salesbacksoitem"));
if (ObjectUtil.isEmpty(salesbacksoitemObj)){ if (ObjectUtil.isEmpty(salesbacksoitemObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
salesbacksoitemQueryWrapper = (QueryWrapper<SalesbacksoitemEntity>)salesbacksoitemObj; salesbacksoitemQueryWrapper = (QueryWrapper<SalesbacksoitemEntity>)salesbacksoitemObj;
salesbacksoitemNum++; salesbacksoitemNum++;
} }
Object paymentsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentsoitemQueryWrapper,saleorderPagination.getMenuId(),"paymentsoitem")); Object paymentsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentsoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_paymentsoitem"));
if (ObjectUtil.isEmpty(paymentsoitemObj)){ if (ObjectUtil.isEmpty(paymentsoitemObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
paymentsoitemQueryWrapper = (QueryWrapper<PaymentsoitemEntity>)paymentsoitemObj; paymentsoitemQueryWrapper = (QueryWrapper<PaymentsoitemEntity>)paymentsoitemObj;
paymentsoitemNum++; paymentsoitemNum++;
} }
Object arinvoices_item0soitemObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0soitemQueryWrapper,saleorderPagination.getMenuId(),"arinvoices_item0soitem")); Object arinvoices_item0soitemObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0soitemQueryWrapper,saleorderPagination.getMenuId(),"jg_arinvoices_item0soitem"));
if (ObjectUtil.isEmpty(arinvoices_item0soitemObj)){ if (ObjectUtil.isEmpty(arinvoices_item0soitemObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -140,7 +140,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
} }
if(!isPc && appPermission){ if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object saleorderObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderQueryWrapper,saleorderPagination.getMenuId(),"saleorder")); Object saleorderObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderQueryWrapper,saleorderPagination.getMenuId(),"jg_saleorder"));
if (ObjectUtil.isEmpty(saleorderObj)){ if (ObjectUtil.isEmpty(saleorderObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -149,7 +149,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
} }
Object salesorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(salesorder_item0QueryWrapper,saleorderPagination.getMenuId(),"salesorder_item0")); Object salesorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(salesorder_item0QueryWrapper,saleorderPagination.getMenuId(),"jg_salesorder_item0"));
if (ObjectUtil.isEmpty(salesorder_item0Obj)){ if (ObjectUtil.isEmpty(salesorder_item0Obj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -158,7 +158,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
} }
Object receiptoutsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutsoitemQueryWrapper,saleorderPagination.getMenuId(),"receiptoutsoitem")); Object receiptoutsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutsoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_receiptoutsoitem"));
if (ObjectUtil.isEmpty(receiptoutsoitemObj)){ if (ObjectUtil.isEmpty(receiptoutsoitemObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -167,7 +167,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
} }
Object collectionsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionsoitemQueryWrapper,saleorderPagination.getMenuId(),"collectionsoitem")); Object collectionsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionsoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_collectionsoitem"));
if (ObjectUtil.isEmpty(collectionsoitemObj)){ if (ObjectUtil.isEmpty(collectionsoitemObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -176,7 +176,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
} }
Object salesbacksoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(salesbacksoitemQueryWrapper,saleorderPagination.getMenuId(),"salesbacksoitem")); Object salesbacksoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(salesbacksoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_salesbacksoitem"));
if (ObjectUtil.isEmpty(salesbacksoitemObj)){ if (ObjectUtil.isEmpty(salesbacksoitemObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -185,7 +185,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
} }
Object paymentsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentsoitemQueryWrapper,saleorderPagination.getMenuId(),"paymentsoitem")); Object paymentsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentsoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_paymentsoitem"));
if (ObjectUtil.isEmpty(paymentsoitemObj)){ if (ObjectUtil.isEmpty(paymentsoitemObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -194,7 +194,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
} }
Object arinvoices_item0soitemObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0soitemQueryWrapper,saleorderPagination.getMenuId(),"arinvoices_item0soitem")); Object arinvoices_item0soitemObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0soitemQueryWrapper,saleorderPagination.getMenuId(),"jg_arinvoices_item0soitem"));
if (ObjectUtil.isEmpty(arinvoices_item0soitemObj)){ if (ObjectUtil.isEmpty(arinvoices_item0soitemObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -261,54 +261,54 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
QueryWrapper<PaymentsoitemEntity> paymentsoitemQueryWrapper=new QueryWrapper<>(); QueryWrapper<PaymentsoitemEntity> paymentsoitemQueryWrapper=new QueryWrapper<>();
int arinvoices_item0soitemNum =0; int arinvoices_item0soitemNum =0;
QueryWrapper<Arinvoices_item0soitemEntity> arinvoices_item0soitemQueryWrapper=new QueryWrapper<>(); QueryWrapper<Arinvoices_item0soitemEntity> arinvoices_item0soitemQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false; boolean pcPermission = true;
boolean appPermission = false; boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){ if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object saleorderObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderQueryWrapper,saleorderPagination.getMenuId(),"saleorder")); Object saleorderObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderQueryWrapper,saleorderPagination.getMenuId(),"jg_saleorder"));
if (ObjectUtil.isEmpty(saleorderObj)){ if (ObjectUtil.isEmpty(saleorderObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
saleorderQueryWrapper = (QueryWrapper<SaleorderitemEntity>)saleorderObj; saleorderQueryWrapper = (QueryWrapper<SaleorderitemEntity>)saleorderObj;
saleorderNum++; saleorderNum++;
} }
Object salesorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(salesorder_item0QueryWrapper,saleorderPagination.getMenuId(),"salesorder_item0")); Object salesorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(salesorder_item0QueryWrapper,saleorderPagination.getMenuId(),"jg_salesorder_item0"));
if (ObjectUtil.isEmpty(salesorder_item0Obj)){ if (ObjectUtil.isEmpty(salesorder_item0Obj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
salesorder_item0QueryWrapper = (QueryWrapper<Salesorder_item0Entity>)salesorder_item0Obj; salesorder_item0QueryWrapper = (QueryWrapper<Salesorder_item0Entity>)salesorder_item0Obj;
salesorder_item0Num++; salesorder_item0Num++;
} }
Object receiptoutsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutsoitemQueryWrapper,saleorderPagination.getMenuId(),"receiptoutsoitem")); Object receiptoutsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutsoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_receiptoutsoitem"));
if (ObjectUtil.isEmpty(receiptoutsoitemObj)){ if (ObjectUtil.isEmpty(receiptoutsoitemObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
receiptoutsoitemQueryWrapper = (QueryWrapper<ReceiptoutsoitemEntity>)receiptoutsoitemObj; receiptoutsoitemQueryWrapper = (QueryWrapper<ReceiptoutsoitemEntity>)receiptoutsoitemObj;
receiptoutsoitemNum++; receiptoutsoitemNum++;
} }
Object collectionsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionsoitemQueryWrapper,saleorderPagination.getMenuId(),"collectionsoitem")); Object collectionsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionsoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_collectionsoitem"));
if (ObjectUtil.isEmpty(collectionsoitemObj)){ if (ObjectUtil.isEmpty(collectionsoitemObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
collectionsoitemQueryWrapper = (QueryWrapper<CollectionsoitemEntity>)collectionsoitemObj; collectionsoitemQueryWrapper = (QueryWrapper<CollectionsoitemEntity>)collectionsoitemObj;
collectionsoitemNum++; collectionsoitemNum++;
} }
Object salesbacksoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(salesbacksoitemQueryWrapper,saleorderPagination.getMenuId(),"salesbacksoitem")); Object salesbacksoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(salesbacksoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_salesbacksoitem"));
if (ObjectUtil.isEmpty(salesbacksoitemObj)){ if (ObjectUtil.isEmpty(salesbacksoitemObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
salesbacksoitemQueryWrapper = (QueryWrapper<SalesbacksoitemEntity>)salesbacksoitemObj; salesbacksoitemQueryWrapper = (QueryWrapper<SalesbacksoitemEntity>)salesbacksoitemObj;
salesbacksoitemNum++; salesbacksoitemNum++;
} }
Object paymentsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentsoitemQueryWrapper,saleorderPagination.getMenuId(),"paymentsoitem")); Object paymentsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentsoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_paymentsoitem"));
if (ObjectUtil.isEmpty(paymentsoitemObj)){ if (ObjectUtil.isEmpty(paymentsoitemObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
paymentsoitemQueryWrapper = (QueryWrapper<PaymentsoitemEntity>)paymentsoitemObj; paymentsoitemQueryWrapper = (QueryWrapper<PaymentsoitemEntity>)paymentsoitemObj;
paymentsoitemNum++; paymentsoitemNum++;
} }
Object arinvoices_item0soitemObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0soitemQueryWrapper,saleorderPagination.getMenuId(),"arinvoices_item0soitem")); Object arinvoices_item0soitemObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0soitemQueryWrapper,saleorderPagination.getMenuId(),"jg_arinvoices_item0soitem"));
if (ObjectUtil.isEmpty(arinvoices_item0soitemObj)){ if (ObjectUtil.isEmpty(arinvoices_item0soitemObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -319,7 +319,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
} }
if(!isPc && appPermission){ if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object saleorderObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderQueryWrapper,saleorderPagination.getMenuId(),"saleorder")); Object saleorderObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderQueryWrapper,saleorderPagination.getMenuId(),"jg_saleorder"));
if (ObjectUtil.isEmpty(saleorderObj)){ if (ObjectUtil.isEmpty(saleorderObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -328,7 +328,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
} }
Object salesorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(salesorder_item0QueryWrapper,saleorderPagination.getMenuId(),"salesorder_item0")); Object salesorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(salesorder_item0QueryWrapper,saleorderPagination.getMenuId(),"jg_salesorder_item0"));
if (ObjectUtil.isEmpty(salesorder_item0Obj)){ if (ObjectUtil.isEmpty(salesorder_item0Obj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -337,7 +337,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
} }
Object receiptoutsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutsoitemQueryWrapper,saleorderPagination.getMenuId(),"receiptoutsoitem")); Object receiptoutsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutsoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_receiptoutsoitem"));
if (ObjectUtil.isEmpty(receiptoutsoitemObj)){ if (ObjectUtil.isEmpty(receiptoutsoitemObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -346,7 +346,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
} }
Object collectionsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionsoitemQueryWrapper,saleorderPagination.getMenuId(),"collectionsoitem")); Object collectionsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionsoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_collectionsoitem"));
if (ObjectUtil.isEmpty(collectionsoitemObj)){ if (ObjectUtil.isEmpty(collectionsoitemObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -355,7 +355,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
} }
Object salesbacksoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(salesbacksoitemQueryWrapper,saleorderPagination.getMenuId(),"salesbacksoitem")); Object salesbacksoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(salesbacksoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_salesbacksoitem"));
if (ObjectUtil.isEmpty(salesbacksoitemObj)){ if (ObjectUtil.isEmpty(salesbacksoitemObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -364,7 +364,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
} }
Object paymentsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentsoitemQueryWrapper,saleorderPagination.getMenuId(),"paymentsoitem")); Object paymentsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentsoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_paymentsoitem"));
if (ObjectUtil.isEmpty(paymentsoitemObj)){ if (ObjectUtil.isEmpty(paymentsoitemObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -373,7 +373,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
} }
Object arinvoices_item0soitemObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0soitemQueryWrapper,saleorderPagination.getMenuId(),"arinvoices_item0soitem")); Object arinvoices_item0soitemObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0soitemQueryWrapper,saleorderPagination.getMenuId(),"jg_arinvoices_item0soitem"));
if (ObjectUtil.isEmpty(arinvoices_item0soitemObj)){ if (ObjectUtil.isEmpty(arinvoices_item0soitemObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {

@ -55,12 +55,12 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, SupplierEnt
int total=0; int total=0;
int supplierNum =0; int supplierNum =0;
QueryWrapper<SupplierEntity> supplierQueryWrapper=new QueryWrapper<>(); QueryWrapper<SupplierEntity> supplierQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false; boolean pcPermission = true;
boolean appPermission = false; boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){ if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object supplierObj=authorizeService.getCondition(new AuthorizeConditionModel(supplierQueryWrapper,supplierPagination.getMenuId(),"supplier")); Object supplierObj=authorizeService.getCondition(new AuthorizeConditionModel(supplierQueryWrapper,supplierPagination.getMenuId(),"jg_supplier"));
if (ObjectUtil.isEmpty(supplierObj)){ if (ObjectUtil.isEmpty(supplierObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -71,7 +71,7 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, SupplierEnt
} }
if(!isPc && appPermission){ if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object supplierObj=authorizeService.getCondition(new AuthorizeConditionModel(supplierQueryWrapper,supplierPagination.getMenuId(),"supplier")); Object supplierObj=authorizeService.getCondition(new AuthorizeConditionModel(supplierQueryWrapper,supplierPagination.getMenuId(),"jg_supplier"));
if (ObjectUtil.isEmpty(supplierObj)){ if (ObjectUtil.isEmpty(supplierObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -141,12 +141,12 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, SupplierEnt
int total=0; int total=0;
int supplierNum =0; int supplierNum =0;
QueryWrapper<SupplierEntity> supplierQueryWrapper=new QueryWrapper<>(); QueryWrapper<SupplierEntity> supplierQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false; boolean pcPermission = true;
boolean appPermission = false; boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){ if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object supplierObj=authorizeService.getCondition(new AuthorizeConditionModel(supplierQueryWrapper,supplierPagination.getMenuId(),"supplier")); Object supplierObj=authorizeService.getCondition(new AuthorizeConditionModel(supplierQueryWrapper,supplierPagination.getMenuId(),"jg_supplier"));
if (ObjectUtil.isEmpty(supplierObj)){ if (ObjectUtil.isEmpty(supplierObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -157,7 +157,7 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, SupplierEnt
} }
if(!isPc && appPermission){ if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object supplierObj=authorizeService.getCondition(new AuthorizeConditionModel(supplierQueryWrapper,supplierPagination.getMenuId(),"supplier")); Object supplierObj=authorizeService.getCondition(new AuthorizeConditionModel(supplierQueryWrapper,supplierPagination.getMenuId(),"jg_supplier"));
if (ObjectUtil.isEmpty(supplierObj)){ if (ObjectUtil.isEmpty(supplierObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {

@ -68,12 +68,12 @@ public class TradeuploadServiceImpl extends ServiceImpl<TradeuploadMapper, Trade
QueryWrapper<TradeuploadEntity> tradeuploadQueryWrapper=new QueryWrapper<>(); QueryWrapper<TradeuploadEntity> tradeuploadQueryWrapper=new QueryWrapper<>();
tradeuploadQueryWrapper.lambda().eq(TradeuploadEntity::getIsExamine,"0"); tradeuploadQueryWrapper.lambda().eq(TradeuploadEntity::getIsExamine,"0");
tradeuploadQueryWrapper.lambda().eq(TradeuploadEntity::getPoundType,"0"); tradeuploadQueryWrapper.lambda().eq(TradeuploadEntity::getPoundType,"0");
boolean pcPermission = false; boolean pcPermission = true;
boolean appPermission = false; boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){ if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object tradeuploadObj=authorizeService.getCondition(new AuthorizeConditionModel(tradeuploadQueryWrapper,tradeuploadPagination.getMenuId(),"tradeupload")); Object tradeuploadObj=authorizeService.getCondition(new AuthorizeConditionModel(tradeuploadQueryWrapper,tradeuploadPagination.getMenuId(),"jg_tradeupload"));
if (ObjectUtil.isEmpty(tradeuploadObj)){ if (ObjectUtil.isEmpty(tradeuploadObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -84,7 +84,7 @@ public class TradeuploadServiceImpl extends ServiceImpl<TradeuploadMapper, Trade
} }
if(!isPc && appPermission){ if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object tradeuploadObj=authorizeService.getCondition(new AuthorizeConditionModel(tradeuploadQueryWrapper,tradeuploadPagination.getMenuId(),"tradeupload")); Object tradeuploadObj=authorizeService.getCondition(new AuthorizeConditionModel(tradeuploadQueryWrapper,tradeuploadPagination.getMenuId(),"jg_tradeupload"));
if (ObjectUtil.isEmpty(tradeuploadObj)){ if (ObjectUtil.isEmpty(tradeuploadObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -145,12 +145,12 @@ public class TradeuploadServiceImpl extends ServiceImpl<TradeuploadMapper, Trade
int total=0; int total=0;
int tradeuploadNum =0; int tradeuploadNum =0;
QueryWrapper<TradeuploadEntity> tradeuploadQueryWrapper=new QueryWrapper<>(); QueryWrapper<TradeuploadEntity> tradeuploadQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false; boolean pcPermission = true;
boolean appPermission = false; boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){ if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object tradeuploadObj=authorizeService.getCondition(new AuthorizeConditionModel(tradeuploadQueryWrapper,tradeuploadPagination.getMenuId(),"tradeupload")); Object tradeuploadObj=authorizeService.getCondition(new AuthorizeConditionModel(tradeuploadQueryWrapper,tradeuploadPagination.getMenuId(),"jg_tradeupload"));
if (ObjectUtil.isEmpty(tradeuploadObj)){ if (ObjectUtil.isEmpty(tradeuploadObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -161,7 +161,7 @@ public class TradeuploadServiceImpl extends ServiceImpl<TradeuploadMapper, Trade
} }
if(!isPc && appPermission){ if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object tradeuploadObj=authorizeService.getCondition(new AuthorizeConditionModel(tradeuploadQueryWrapper,tradeuploadPagination.getMenuId(),"tradeupload")); Object tradeuploadObj=authorizeService.getCondition(new AuthorizeConditionModel(tradeuploadQueryWrapper,tradeuploadPagination.getMenuId(),"jg_tradeupload"));
if (ObjectUtil.isEmpty(tradeuploadObj)){ if (ObjectUtil.isEmpty(tradeuploadObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {

@ -55,12 +55,12 @@ public class VehicleServiceImpl extends ServiceImpl<VehicleMapper, VehicleEntity
int total=0; int total=0;
int vehicleNum =0; int vehicleNum =0;
QueryWrapper<VehicleEntity> vehicleQueryWrapper=new QueryWrapper<>(); QueryWrapper<VehicleEntity> vehicleQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false; boolean pcPermission = true;
boolean appPermission = false; boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){ if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object vehicleObj=authorizeService.getCondition(new AuthorizeConditionModel(vehicleQueryWrapper,vehiclePagination.getMenuId(),"vehicle")); Object vehicleObj=authorizeService.getCondition(new AuthorizeConditionModel(vehicleQueryWrapper,vehiclePagination.getMenuId(),"jg_vehicle"));
if (ObjectUtil.isEmpty(vehicleObj)){ if (ObjectUtil.isEmpty(vehicleObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -71,7 +71,7 @@ public class VehicleServiceImpl extends ServiceImpl<VehicleMapper, VehicleEntity
} }
if(!isPc && appPermission){ if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object vehicleObj=authorizeService.getCondition(new AuthorizeConditionModel(vehicleQueryWrapper,vehiclePagination.getMenuId(),"vehicle")); Object vehicleObj=authorizeService.getCondition(new AuthorizeConditionModel(vehicleQueryWrapper,vehiclePagination.getMenuId(),"jg_vehicle"));
if (ObjectUtil.isEmpty(vehicleObj)){ if (ObjectUtil.isEmpty(vehicleObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -136,12 +136,12 @@ public class VehicleServiceImpl extends ServiceImpl<VehicleMapper, VehicleEntity
int total=0; int total=0;
int vehicleNum =0; int vehicleNum =0;
QueryWrapper<VehicleEntity> vehicleQueryWrapper=new QueryWrapper<>(); QueryWrapper<VehicleEntity> vehicleQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false; boolean pcPermission = true;
boolean appPermission = false; boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){ if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object vehicleObj=authorizeService.getCondition(new AuthorizeConditionModel(vehicleQueryWrapper,vehiclePagination.getMenuId(),"vehicle")); Object vehicleObj=authorizeService.getCondition(new AuthorizeConditionModel(vehicleQueryWrapper,vehiclePagination.getMenuId(),"jg_vehicle"));
if (ObjectUtil.isEmpty(vehicleObj)){ if (ObjectUtil.isEmpty(vehicleObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -152,7 +152,7 @@ public class VehicleServiceImpl extends ServiceImpl<VehicleMapper, VehicleEntity
} }
if(!isPc && appPermission){ if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object vehicleObj=authorizeService.getCondition(new AuthorizeConditionModel(vehicleQueryWrapper,vehiclePagination.getMenuId(),"vehicle")); Object vehicleObj=authorizeService.getCondition(new AuthorizeConditionModel(vehicleQueryWrapper,vehiclePagination.getMenuId(),"jg_vehicle"));
if (ObjectUtil.isEmpty(vehicleObj)){ if (ObjectUtil.isEmpty(vehicleObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {

@ -51,12 +51,12 @@ public class WareHouseServiceImpl extends ServiceImpl<WareHouseMapper, WareHouse
int total=0; int total=0;
int wareHouseNum =0; int wareHouseNum =0;
QueryWrapper<WareHouseEntity> wareHouseQueryWrapper=new QueryWrapper<>(); QueryWrapper<WareHouseEntity> wareHouseQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false; boolean pcPermission = true;
boolean appPermission = false; boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){ if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object wareHouseObj=authorizeService.getCondition(new AuthorizeConditionModel(wareHouseQueryWrapper,wareHousePagination.getMenuId(),"wareHouse")); Object wareHouseObj=authorizeService.getCondition(new AuthorizeConditionModel(wareHouseQueryWrapper,wareHousePagination.getMenuId(),"jg_wareHouse"));
if (ObjectUtil.isEmpty(wareHouseObj)){ if (ObjectUtil.isEmpty(wareHouseObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -67,7 +67,7 @@ public class WareHouseServiceImpl extends ServiceImpl<WareHouseMapper, WareHouse
} }
if(!isPc && appPermission){ if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object wareHouseObj=authorizeService.getCondition(new AuthorizeConditionModel(wareHouseQueryWrapper,wareHousePagination.getMenuId(),"wareHouse")); Object wareHouseObj=authorizeService.getCondition(new AuthorizeConditionModel(wareHouseQueryWrapper,wareHousePagination.getMenuId(),"jg_wareHouse"));
if (ObjectUtil.isEmpty(wareHouseObj)){ if (ObjectUtil.isEmpty(wareHouseObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -122,12 +122,12 @@ public class WareHouseServiceImpl extends ServiceImpl<WareHouseMapper, WareHouse
int total=0; int total=0;
int wareHouseNum =0; int wareHouseNum =0;
QueryWrapper<WareHouseEntity> wareHouseQueryWrapper=new QueryWrapper<>(); QueryWrapper<WareHouseEntity> wareHouseQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false; boolean pcPermission = true;
boolean appPermission = false; boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){ if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object wareHouseObj=authorizeService.getCondition(new AuthorizeConditionModel(wareHouseQueryWrapper,wareHousePagination.getMenuId(),"wareHouse")); Object wareHouseObj=authorizeService.getCondition(new AuthorizeConditionModel(wareHouseQueryWrapper,wareHousePagination.getMenuId(),"jg_wareHouse"));
if (ObjectUtil.isEmpty(wareHouseObj)){ if (ObjectUtil.isEmpty(wareHouseObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
@ -138,7 +138,7 @@ public class WareHouseServiceImpl extends ServiceImpl<WareHouseMapper, WareHouse
} }
if(!isPc && appPermission){ if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object wareHouseObj=authorizeService.getCondition(new AuthorizeConditionModel(wareHouseQueryWrapper,wareHousePagination.getMenuId(),"wareHouse")); Object wareHouseObj=authorizeService.getCondition(new AuthorizeConditionModel(wareHouseQueryWrapper,wareHousePagination.getMenuId(),"jg_wareHouse"));
if (ObjectUtil.isEmpty(wareHouseObj)){ if (ObjectUtil.isEmpty(wareHouseObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {

@ -1,5 +1,5 @@
module.exports = { module.exports = {
title: 'LINKAGE-快速开发平台', title: '再生资源智慧管家平台',
/** /**
* @type {boolean} true | false * @type {boolean} true | false

@ -20,15 +20,15 @@
<div class="JNPF-common-layout-main JNPF-flex-main"> <div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head"> <div class="JNPF-common-head">
<div> <div>
<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()"> <el-button type="primary" icon="el-icon-plus"v-has="'btn_add'" @click="addOrUpdateHandle()" >
</el-button> </el-button>
<el-button type="text" icon="el-icon-download" @click="exportData()"> <el-button type="text" icon="el-icon-download" v-has="'btn_download'" @click="exportData()">
</el-button> </el-button>
<el-button type="text" icon="el-icon-download" @click=""> <el-button type="text" icon="el-icon-download" v-has="'btn_upload'" @click="">
</el-button> </el-button>
<el-button type="text" icon="el-icon-download" @click=""> <el-button type="text" icon="el-icon-download" v-has="'btn_edit'" @click="">
</el-button> </el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()"> <el-button type="text" icon="el-icon-delete" v-has="'btn_batchRemove'" @click="handleBatchRemoveDel()">
</el-button> </el-button>
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
@ -49,9 +49,9 @@
<el-table-column prop="lastmodifyusername" label="修改人名称" width="300"sortable align="center"/> <el-table-column prop="lastmodifyusername" label="修改人名称" width="300"sortable align="center"/>
<el-table-column label="操作" fixed="right" width="100"> <el-table-column label="操作" fixed="right" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row.id)"> <el-button type="text" v-has="'btn_edit'" @click="addOrUpdateHandle(scope.row.id)">
</el-button> </el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)"> <el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'" @click="handleDel(scope.row.id)">
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>

@ -20,13 +20,13 @@
<div class="JNPF-common-layout-main JNPF-flex-main"> <div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head"> <div class="JNPF-common-head">
<div> <div>
<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()"> <el-button type="primary" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">
</el-button> </el-button>
<!-- <el-button type="text" icon="el-icon-download" @click="exportData()">--> <!-- <el-button type="text" icon="el-icon-download" @click="exportData()">-->
<!-- </el-button>--> <!-- </el-button>-->
<!-- <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">--> <!-- <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">-->
<!-- </el-button>--> <!-- </el-button>-->
<el-button type="text" icon="el-icon-plus" @click="1"> <el-button type="text" v-has="'btn_edit'" icon="el-icon-plus" @click="1">
</el-button> </el-button>
<el-button type="text" icon="el-icon-plus" @click="1"> <el-button type="text" icon="el-icon-plus" @click="1">
</el-button> </el-button>
@ -84,7 +84,7 @@
<el-table-column label="操作" fixed="right" align="center" <el-table-column label="操作" fixed="right" align="center"
width="200"> width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" <el-button type="text" v-has="'btn_edit'"
@click="addOrUpdateHandle(scope.row.id)">编辑 @click="addOrUpdateHandle(scope.row.id)">编辑
</el-button> </el-button>
<!-- <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">--> <!-- <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">-->

@ -20,11 +20,11 @@
<div class="JNPF-common-layout-main JNPF-flex-main"> <div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head"> <div class="JNPF-common-head">
<div> <div>
<el-button type="text" icon="el-icon-plus" @click="addOrUpdateHandle()"> <el-button type="text" icon="el-icon-plus" v-has="'btn_add'" @click="addOrUpdateHandle()">
</el-button> </el-button>
<el-button type="text" icon="el-icon-download" @click="exportData()"> <el-button type="text" icon="el-icon-download" v-has="'btn_download'" @click="exportData()">
</el-button> </el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()"> <el-button type="text" icon="el-icon-delete" v-has="'btn_batchRemove'" @click="handleBatchRemoveDel()">
</el-button> </el-button>
<el-button type="text" icon="el-icon-check" @click="exportData()"> <el-button type="text" icon="el-icon-check" @click="exportData()">
</el-button> </el-button>
@ -73,11 +73,11 @@
<el-table-column prop="creatorUserName" sortable label="制单人" width="150" align="center" /> <el-table-column prop="creatorUserName" sortable label="制单人" width="150" align="center" />
<el-table-column label="操作" fixed="right" width="150"> <el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row.id)"> <el-button type="text" v-has="'btn_edit'" @click="addOrUpdateHandle(scope.row.id)">
</el-button> </el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)"> <el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'" @click="handleDel(scope.row.id)">
</el-button> </el-button>
<el-button type="text" @click="goDetail(scope.row.id)"> <el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">
</el-button> </el-button>
<el-button type="text" @click="">撤回申请</el-button> <el-button type="text" @click="">撤回申请</el-button>

@ -43,13 +43,13 @@
<div class="JNPF-common-layout-main JNPF-flex-main"> <div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head"> <div class="JNPF-common-head">
<div> <div>
<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()"> <el-button type="primary" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">
</el-button> </el-button>
<el-button type="text" icon="el-icon-download" @click="exportData()"> <el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">
</el-button> </el-button>
<el-button type="text" icon="el-icon-download" @click=""> <el-button type="text" v-has="'btn_upload'" icon="el-icon-download" @click="">
</el-button> </el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()"> <el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">
</el-button> </el-button>
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
@ -119,10 +119,10 @@
<el-table-column label="操作" fixed="right" <el-table-column label="操作" fixed="right"
width="150"> width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" <el-button type="text" v-has="'btn_edit'"
@click="addOrUpdateHandle(scope.row.id)">编辑 @click="addOrUpdateHandle(scope.row.id)">编辑
</el-button> </el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)"> <el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">
</el-button> </el-button>
<el-button type="text" <el-button type="text"
@click="goDetail(scope.row.id)">详情 @click="goDetail(scope.row.id)">详情

@ -6,12 +6,12 @@
<el-form @submit.native.prevent> <el-form @submit.native.prevent>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="编码"> <el-form-item label="编码">
<el-input v-model="query.inventoryOrgCode" placeholder="请输入" clearable> </el-input> <el-input v-model="query.inventoryOrgCode" placeholder="请输入" clearable></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="名称"> <el-form-item label="名称">
<el-input v-model="query.inventoryOrgName" placeholder="请输入" clearable> </el-input> <el-input v-model="query.inventoryOrgName" placeholder="请输入" clearable></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
@ -25,7 +25,7 @@
<div class="JNPF-common-layout-main JNPF-flex-main"> <div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head"> <div class="JNPF-common-head">
<div> <div>
<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()"> <el-button type="primary" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">
</el-button> </el-button>
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
@ -36,27 +36,28 @@
<screenfull isContainer/> <screenfull isContainer/>
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' > <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'>
<el-table-column prop="inventoryOrgCode" label="编码" width="0" align="left" <el-table-column prop="inventoryOrgCode" label="编码" width="0" align="left"
/> />
<el-table-column prop="inventoryOrgName" label="名称" width="0" align="left" <el-table-column prop="inventoryOrgName" label="名称" width="0" align="left"
/> />
<el-table-column prop="creatorTime" label="创建时间" width="0" align="left" <el-table-column prop="creatorTime" label="创建时间" width="0" align="left"
/> />
<el-table-column prop="companyId" label="所属组织" width="0" align="left" <el-table-column prop="companyId" label="所属组织" width="0" align="left"
/> />
<el-table-column label="操作" fixed="right" <el-table-column label="操作" fixed="right"
width="100" > width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" <el-button type="text" v-has="'btn_edit'"
@click="addOrUpdateHandle(scope.row.id)" >编辑 @click="addOrUpdateHandle(scope.row.id)">编辑
</el-button> </el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)"> <el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
</JNPF-table> </JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/> <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData"/>
</div> </div>
</div> </div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/> <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
@ -74,13 +75,13 @@
import Detail from './Detail' import Detail from './Detail'
export default { export default {
components: {JNPFForm, ExportBox,Detail}, components: {JNPFForm, ExportBox, Detail},
data() { data() {
return { return {
detailVisible: false, detailVisible: false,
query: { query: {
inventoryOrgCode:undefined, inventoryOrgCode: undefined,
inventoryOrgName:undefined, inventoryOrgName: undefined,
}, },
treeProps: { treeProps: {
children: 'children', children: 'children',
@ -104,8 +105,8 @@
{prop: 'creatorTime', label: '创建时间'}, {prop: 'creatorTime', label: '创建时间'},
{prop: 'companyId', label: '所属组织'}, {prop: 'companyId', label: '所属组织'},
], ],
companyIdOptions:[], companyIdOptions: [],
companyIdProps:{"label":"F_FullName","value":"F_Id"}, companyIdProps: {"label": "F_FullName", "value": "F_Id"},
} }
}, },
computed: { computed: {
@ -117,7 +118,7 @@
this.initData() this.initData()
}, },
methods: { methods: {
goDetail(id){ goDetail(id) {
this.detailVisible = true this.detailVisible = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.Detail.init(id) this.$refs.Detail.init(id)
@ -133,15 +134,15 @@
let _query = { let _query = {
...this.listQuery, ...this.listQuery,
...this.query, ...this.query,
menuId:this.menuId menuId: this.menuId
}; };
request({ request({
url: `/api/example/InventoryOrg/getList`, url: `/api/example/InventoryOrg/getList`,
method: 'post', method: 'post',
data: _query data: _query
}).then(res => { }).then(res => {
var _list =[]; var _list = [];
for(let i=0;i<res.data.list.length;i++){ for (let i = 0; i < res.data.list.length; i++) {
let _data = res.data.list[i]; let _data = res.data.list[i];
_list.push(_data) _list.push(_data)
} }
@ -183,7 +184,7 @@
}) })
}, },
download(data) { download(data) {
let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId} let query = {...data, ...this.listQuery, ...this.query, menuId: this.menuId}
request({ request({
url: `/api/example/InventoryOrg/Actions/Export`, url: `/api/example/InventoryOrg/Actions/Export`,
method: 'GET', method: 'GET',

@ -6,12 +6,12 @@
<el-form @submit.native.prevent> <el-form @submit.native.prevent>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="编码"> <el-form-item label="编码">
<el-input v-model="query.inventoryOrgDetailCode" placeholder="请输入" clearable> </el-input> <el-input v-model="query.inventoryOrgDetailCode" placeholder="请输入" clearable></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="名称"> <el-form-item label="名称">
<el-input v-model="query.inventoryOrgDetailName" placeholder="请输入" clearable> </el-input> <el-input v-model="query.inventoryOrgDetailName" placeholder="请输入" clearable></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
@ -25,9 +25,9 @@
<div class="JNPF-common-layout-main JNPF-flex-main"> <div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head"> <div class="JNPF-common-head">
<div> <div>
<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()"> <el-button type="primary" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">
</el-button> </el-button>
<el-button type="text" icon="el-icon-download" @click="exportData()" > <el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">
</el-button> </el-button>
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
@ -38,27 +38,28 @@
<screenfull isContainer/> <screenfull isContainer/>
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' > <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'>
<el-table-column prop="inventoryOrgDetailCode" label="编码" width="0" align="left" <el-table-column prop="inventoryOrgDetailCode" label="编码" width="0" align="left"
/> />
<el-table-column prop="inventoryOrgDetailName" label="名称" width="0" align="left" <el-table-column prop="inventoryOrgDetailName" label="名称" width="0" align="left"
/> />
<el-table-column prop="inventoryId" label="库存组织" width="0" align="left" <el-table-column prop="inventoryId" label="库存组织" width="0" align="left"
/> />
<el-table-column prop="creatorTime" label="创建时间" width="0" align="left" <el-table-column prop="creatorTime" label="创建时间" width="0" align="left"
/> />
<el-table-column label="操作" fixed="right" <el-table-column label="操作" fixed="right"
width="100" > width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" <el-button type="text" v-has="'btn_edit'"
@click="addOrUpdateHandle(scope.row.id)" >编辑 @click="addOrUpdateHandle(scope.row.id)">编辑
</el-button> </el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)"> <el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
</JNPF-table> </JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/> <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData"/>
</div> </div>
</div> </div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/> <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
@ -76,13 +77,13 @@
import Detail from './Detail' import Detail from './Detail'
export default { export default {
components: {JNPFForm, ExportBox,Detail}, components: {JNPFForm, ExportBox, Detail},
data() { data() {
return { return {
detailVisible: false, detailVisible: false,
query: { query: {
inventoryOrgDetailCode:undefined, inventoryOrgDetailCode: undefined,
inventoryOrgDetailName:undefined, inventoryOrgDetailName: undefined,
}, },
treeProps: { treeProps: {
children: 'children', children: 'children',
@ -117,7 +118,7 @@
this.initData() this.initData()
}, },
methods: { methods: {
goDetail(id){ goDetail(id) {
this.detailVisible = true this.detailVisible = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.Detail.init(id) this.$refs.Detail.init(id)
@ -133,15 +134,15 @@
let _query = { let _query = {
...this.listQuery, ...this.listQuery,
...this.query, ...this.query,
menuId:this.menuId menuId: this.menuId
}; };
request({ request({
url: `/api/example/InventoryOrgDetail/getList`, url: `/api/example/InventoryOrgDetail/getList`,
method: 'post', method: 'post',
data: _query data: _query
}).then(res => { }).then(res => {
var _list =[]; var _list = [];
for(let i=0;i<res.data.list.length;i++){ for (let i = 0; i < res.data.list.length; i++) {
let _data = res.data.list[i]; let _data = res.data.list[i];
_list.push(_data) _list.push(_data)
} }
@ -183,7 +184,7 @@
}) })
}, },
download(data) { download(data) {
let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId} let query = {...data, ...this.listQuery, ...this.query, menuId: this.menuId}
request({ request({
url: `/api/example/InventoryOrgDetail/Actions/Export`, url: `/api/example/InventoryOrgDetail/Actions/Export`,
method: 'GET', method: 'GET',

@ -20,11 +20,11 @@
<div class="JNPF-common-layout-main JNPF-flex-main"> <div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head"> <div class="JNPF-common-head">
<div> <div>
<el-button type="text" icon="el-icon-plus" @click="addOrUpdateHandle()"> <el-button type="text" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">
</el-button> </el-button>
<el-button type="text" icon="el-icon-download" @click="exportData()"> <el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">
</el-button> </el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()"> <el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">
</el-button> </el-button>
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
@ -64,11 +64,11 @@
<el-table-column prop="remark" label="备注" width="150" align="center" sortable="custom" /> <el-table-column prop="remark" label="备注" width="150" align="center" sortable="custom" />
<el-table-column label="操作" fixed="right" width="150" align="center" > <el-table-column label="操作" fixed="right" width="150" align="center" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)"> <el-button type="text" v-has="'btn_edit'" @click="addOrUpdateHandle(scope.row)">
</el-button> </el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)"> <el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">
</el-button> </el-button>
<el-button type="text" @click="goDetail(scope.row.id)"> <el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>

@ -25,13 +25,13 @@
<div class="JNPF-common-layout-main JNPF-flex-main"> <div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head"> <div class="JNPF-common-head">
<div> <div>
<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()"> <el-button type="primary" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">
</el-button> </el-button>
<el-button type="text" icon="el-icon-download" @click="exportData()"> <el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">
</el-button> </el-button>
<el-button type="text" icon="el-icon-download" @click=""> <el-button type="text" v-has="'btn_upload'" icon="el-icon-download" @click="">
</el-button> </el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()"> <el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">
</el-button> </el-button>
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
@ -94,10 +94,10 @@
<el-table-column label="操作" fixed="right" <el-table-column label="操作" fixed="right"
width="100"> width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" <el-button type="text" v-has="'btn_edit'"
@click="addOrUpdateHandle(scope.row.id)">编辑 @click="addOrUpdateHandle(scope.row.id)">编辑
</el-button> </el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)"> <el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>

@ -30,15 +30,15 @@
<div class="JNPF-common-layout-main JNPF-flex-main"> <div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head"> <div class="JNPF-common-head">
<div> <div>
<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()"> <el-button type="primary" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">
</el-button> </el-button>
<el-button type="text" icon="el-icon-download" @click="exportData()"> <el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">
</el-button> </el-button>
<el-button type="text" icon="el-icon-download" @click=""> <el-button type="text" v-has="'btn_upload'" icon="el-icon-download" @click="">
</el-button> </el-button>
<el-button type="text" icon="el-icon-download" @click=""> <el-button type="text" v-has="'btn_edit'" icon="el-icon-download" @click="">
</el-button> </el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()"> <el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">
</el-button> </el-button>
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
@ -77,10 +77,10 @@
<el-table-column label="操作" fixed="right" <el-table-column label="操作" fixed="right"
width="100"> width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" <el-button type="text" v-has="'btn_edit'"
@click="addOrUpdateHandle(scope.row.id)">编辑 @click="addOrUpdateHandle(scope.row.id)">编辑
</el-button> </el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)"> <el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'" @click="handleDel(scope.row.id)">
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>

@ -25,13 +25,13 @@
<div class="JNPF-common-layout-main JNPF-flex-main"> <div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head"> <div class="JNPF-common-head">
<div> <div>
<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()"> <el-button type="primary" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">
</el-button> </el-button>
<el-button type="text" icon="el-icon-download" @click="exportData()"> <el-button type="text" icon="el-icon-download" @click="exportData()" v-has="'btn_download'">
</el-button> </el-button>
<el-button type="text" icon="el-icon-download" @click=""> <el-button type="text" icon="el-icon-download" v-has="'btn_upload'" @click="">
</el-button> </el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()"> <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()" v-has="'btn_batchRemove'" >批量删
</el-button> </el-button>
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
@ -58,10 +58,10 @@
<el-table-column label="操作" fixed="right" <el-table-column label="操作" fixed="right"
width="100"> width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" <el-button type="text" v-has="'btn_edit'"
@click="addOrUpdateHandle(scope.row.id)">编辑 @click="addOrUpdateHandle(scope.row.id)">编辑
</el-button> </el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)"> <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)" v-has="'btn_remove'">
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>

@ -20,11 +20,11 @@
<div class="JNPF-common-layout-main JNPF-flex-main"> <div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head"> <div class="JNPF-common-head">
<div> <div>
<el-button type="text" icon="el-icon-plus" @click="addOrUpdateHandle()"> <el-button type="text" icon="el-icon-plus" v-has="'btn_add'" @click="addOrUpdateHandle()">
</el-button> </el-button>
<el-button type="text" icon="el-icon-download" @click="exportData()"> <el-button type="text" icon="el-icon-download" v-has="'btn_download'" @click="exportData()">
</el-button> </el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()"> <el-button type="text" icon="el-icon-delete" v-has="'btn_batchRemove'" @click="handleBatchRemoveDel()">
</el-button> </el-button>
<el-button type="text" icon="el-icon-check" @click="submitprice()"> <el-button type="text" icon="el-icon-check" @click="submitprice()">
</el-button> </el-button>
@ -70,11 +70,11 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" fixed="right" width="150" align="center" > <el-table-column label="操作" fixed="right" width="150" align="center" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="scope.row.status == 0" type="text" @click="addOrUpdateHandle(scope.row.id)"> <el-button v-if="scope.row.status == 0" type="text" v-has="'btn_edit'" @click="addOrUpdateHandle(scope.row.id)">
</el-button> </el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)"> <el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'" @click="handleDel(scope.row.id)">
</el-button> </el-button>
<el-button type="text" @click="goDetail(scope.row.id)"> <el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>

@ -74,13 +74,13 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" fixed="right" width="100"> <el-table-column label="操作" fixed="right" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" :disabled="[1,2,4,5].indexOf(scope.row.flowState)>-1" <el-button v-has="'btn_edit'" type="text" :disabled="[1,2,4,5].indexOf(scope.row.flowState)>-1"
@click="addOrUpdateHandle(scope.row.id)">编辑 @click="addOrUpdateHandle(scope.row.id)">编辑
</el-button> </el-button>
<el-button type="text" class="JNPF-table-delBtn" :disabled="!!scope.row.flowState" <el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" :disabled="!!scope.row.flowState"
@click="handleDel(scope.row.id)">删除 @click="handleDel(scope.row.id)">删除
</el-button> </el-button>
<el-button size="mini" type="text" :disabled="!scope.row.flowState" <el-button size="mini" v-has="'btn_detail'" type="text" :disabled="!scope.row.flowState"
@click="addOrUpdateHandle(scope.row.id,scope.row.flowState)">详情</el-button> @click="addOrUpdateHandle(scope.row.id,scope.row.flowState)">详情</el-button>
<el-button size="mini" type="text" :disabled="!scope.row.flowState" <el-button size="mini" type="text" :disabled="!scope.row.flowState"
@click="fukuanHandle(scope.row.id,scope.row.flowState)">付款</el-button> @click="fukuanHandle(scope.row.id,scope.row.flowState)">付款</el-button>

@ -20,11 +20,11 @@
<div class="JNPF-common-layout-main JNPF-flex-main"> <div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head"> <div class="JNPF-common-head">
<div> <div>
<el-button type="text" icon="el-icon-plus" @click="addOrUpdateHandle()"> <el-button type="text" icon="el-icon-plus" v-has="'btn_add'" @click="addOrUpdateHandle()">
</el-button> </el-button>
<el-button type="text" icon="el-icon-download" @click="exportData()"> <el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">
</el-button> </el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()"> <el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">
</el-button> </el-button>
<el-button type="text" icon="el-icon-check" @click="handleBatchCaigou()"> <el-button type="text" icon="el-icon-check" @click="handleBatchCaigou()">
</el-button> </el-button>
@ -105,9 +105,9 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" fixed="right" width="100" align="center"> <el-table-column label="操作" fixed="right" width="100" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row.id)"> <el-button type="text" v-has="'btn_edit'" @click="addOrUpdateHandle(scope.row.id)">
</el-button> </el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)"> <el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>

@ -20,15 +20,15 @@
<div class="JNPF-common-layout-main JNPF-flex-main"> <div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head"> <div class="JNPF-common-head">
<div> <div>
<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()"> <el-button type="primary" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">
</el-button> </el-button>
<el-button type="text" icon="el-icon-download" @click=""> <el-button type="text" v-has="'btn_edit'" icon="el-icon-download" @click="">
</el-button> </el-button>
<el-button type="text" icon="el-icon-download" @click="">查看 <el-button type="text" icon="el-icon-download" @click="">查看
</el-button> </el-button>
<el-button type="text" icon="el-icon-download" @click="exportData()"> <el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">
</el-button> </el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()"> <el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">
</el-button> </el-button>
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
@ -66,11 +66,11 @@
<el-table-column prop="remark" label="备注" width="0" align="center"sortable/> <el-table-column prop="remark" label="备注" width="0" align="center"sortable/>
<el-table-column label="操作" fixed="right" width="150"> <el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row.id)"> <el-button type="text" v-has="'btn_edit'" @click="addOrUpdateHandle(scope.row.id)">
</el-button> </el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)"> <el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">
</el-button> </el-button>
<el-button type="text" @click="goDetail(scope.row.id)"> <el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>

@ -20,11 +20,11 @@
<div class="JNPF-common-layout-main JNPF-flex-main"> <div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head"> <div class="JNPF-common-head">
<div> <div>
<el-button type="text" icon="el-icon-plus" @click="addOrUpdateHandle()"> <el-button type="text" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">
</el-button> </el-button>
<el-button type="text" icon="el-icon-download" @click="exportData()"> <el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">
</el-button> </el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()"> <el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">
</el-button> </el-button>
<el-button type="text" icon="el-icon-delete" @click="fapiaoluruHandle()"> <el-button type="text" icon="el-icon-delete" @click="fapiaoluruHandle()">
</el-button> </el-button>
@ -72,11 +72,11 @@
<el-table-column prop="remark" label="备注信息" width="0" align="center" /> --> <el-table-column prop="remark" label="备注信息" width="0" align="center" /> -->
<el-table-column label="操作" fixed="right" width="100" align="center" > <el-table-column label="操作" fixed="right" width="100" align="center" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)"> <el-button type="text" v-has="'btn_edit'" @click="addOrUpdateHandle(scope.row)">
</el-button> </el-button>
<el-button type="text" @click="goDetail(scope.row.id)"> <el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">
</el-button> </el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row)"> <el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row)">
</el-button> </el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleTuihuo(scope.row)">退 <el-button type="text" class="JNPF-table-delBtn" @click="handleTuihuo(scope.row)">退
</el-button> </el-button>

@ -28,11 +28,11 @@
<div class="JNPF-common-layout-main JNPF-flex-main"> <div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head"> <div class="JNPF-common-head">
<div> <div>
<el-button type="text" icon="el-icon-plus" @click="addOrUpdateHandle()"> <el-button type="text" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">
</el-button> </el-button>
<el-button type="text" icon="el-icon-download" @click="exportData()"> <el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">
</el-button> </el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()"> <el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">
</el-button> </el-button>
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
@ -71,11 +71,11 @@
<el-table-column prop="creatorUserName" sortable label="创建人" width="120" align="center" /> <el-table-column prop="creatorUserName" sortable label="创建人" width="120" align="center" />
<el-table-column label="操作" fixed="right" width="150" align="center"> <el-table-column label="操作" fixed="right" width="150" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)"> <el-button type="text" v-has="'btn_edit'" @click="addOrUpdateHandle(scope.row)">
</el-button> </el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)"> <el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">
</el-button> </el-button>
<el-button type="text" @click="goDetail(scope.row.id)"> <el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>

@ -33,11 +33,11 @@
<div class="JNPF-common-layout-main JNPF-flex-main"> <div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head"> <div class="JNPF-common-head">
<div> <div>
<el-button type="text" icon="el-icon-plus" @click="addOrUpdateHandle()"> <el-button type="text" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">
</el-button> </el-button>
<el-button type="text" icon="el-icon-download" @click="exportData()"> <el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">
</el-button> </el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()"> <el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">
</el-button> </el-button>
<el-button type="text" icon="el-icon-check" @click="exportData()"> <el-button type="text" icon="el-icon-check" @click="exportData()">
</el-button> </el-button>
@ -80,11 +80,11 @@
<el-table-column prop="creatorUserName" label="创建人名称" width="120" sortable align="center" /> <el-table-column prop="creatorUserName" label="创建人名称" width="120" sortable align="center" />
<el-table-column label="操作" fixed="right" width="150"> <el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row.id)"> <el-button type="text" v-has="'btn_edit'" @click="addOrUpdateHandle(scope.row.id)">
</el-button> </el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)"> <el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">
</el-button> </el-button>
<el-button type="text" @click="goDetail(scope.row.id)"> <el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>

@ -25,15 +25,15 @@
<div class="JNPF-common-layout-main JNPF-flex-main"> <div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head"> <div class="JNPF-common-head">
<div> <div>
<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()"> <el-button type="primary" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">
</el-button> </el-button>
<el-button type="text" icon="el-icon-download" @click="exportData()"> <el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">
</el-button> </el-button>
<el-button type="text" icon="el-icon-download" @click=""> <el-button type="text" v-has="'btn_upload'" icon="el-icon-download" @click="">
</el-button> </el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()"> <el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">
</el-button> </el-button>
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
@ -69,10 +69,10 @@
<el-table-column label="操作" fixed="right" <el-table-column label="操作" fixed="right"
width="100"> width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" <el-button type="text" v-has="'btn_edit'"
@click="addOrUpdateHandle(scope.row.id)">编辑 @click="addOrUpdateHandle(scope.row.id)">编辑
</el-button> </el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)"> <el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>

@ -20,11 +20,11 @@
<div class="JNPF-common-layout-main JNPF-flex-main"> <div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head"> <div class="JNPF-common-head">
<div> <div>
<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()"> <el-button type="primary" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">
</el-button> </el-button>
<el-button type="text" icon="el-icon-download" @click="exportData()"> <el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">
</el-button> </el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()"> <el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">
</el-button> </el-button>
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
@ -75,12 +75,12 @@
<el-table-column label="操作" fixed="right" <el-table-column label="操作" fixed="right"
width="150"> width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" <el-button type="text" v-has="'btn_edit'"
@click="addOrUpdateHandle(scope.row.id)">编辑 @click="addOrUpdateHandle(scope.row.id)">编辑
</el-button> </el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)"> <el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">
</el-button> </el-button>
<el-button type="text" <el-button type="text" v-has="'btn_detail'"
@click="goDetail(scope.row.id)">详情 @click="goDetail(scope.row.id)">详情
</el-button> </el-button>
</template> </template>

@ -28,11 +28,11 @@
<div class="JNPF-common-layout-main JNPF-flex-main"> <div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head"> <div class="JNPF-common-head">
<div> <div>
<el-button type="text" icon="el-icon-plus" @click="addOrUpdateHandle()"> <el-button type="text" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">
</el-button> </el-button>
<el-button type="text" icon="el-icon-download" @click="exportData()"> <el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">
</el-button> </el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()"> <el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">
</el-button> </el-button>
<el-button type="text" icon="el-icon-check" @click="exportData()"> <el-button type="text" icon="el-icon-check" @click="exportData()">
</el-button> </el-button>
@ -80,11 +80,11 @@
<el-table-column prop="creatorUserName" label="制单人" sortable width="150" align="center" /> <el-table-column prop="creatorUserName" label="制单人" sortable width="150" align="center" />
<el-table-column label="操作" fixed="right" width="150" align="center" > <el-table-column label="操作" fixed="right" width="150" align="center" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row.id)"> <el-button type="text" v-has="'btn_edit'" @click="addOrUpdateHandle(scope.row.id)">
</el-button> </el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)"> <el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">
</el-button> </el-button>
<el-button type="text" @click="goDetail(scope.row.id)"> <el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>

@ -48,13 +48,13 @@
<div class="JNPF-common-layout-main JNPF-flex-main"> <div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head"> <div class="JNPF-common-head">
<div> <div>
<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()"> <el-button type="primary" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">
</el-button> </el-button>
<el-button type="text" icon="el-icon-download" @click="exportData()"> <el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">
</el-button> </el-button>
<el-button type="text" icon="el-icon-download" @click=""> <el-button type="text" v-has="'btn_upload'" icon="el-icon-download" @click="">
</el-button> </el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()"> <el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">
</el-button> </el-button>
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
@ -153,10 +153,10 @@
<el-table-column label="操作" fixed="right" <el-table-column label="操作" fixed="right"
width="100"> width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" <el-button type="text" v-has="'btn_edit'"
@click="addOrUpdateHandle(scope.row.id)">编辑 @click="addOrUpdateHandle(scope.row.id)">编辑
</el-button> </el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)"> <el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>

@ -39,13 +39,13 @@
<div class="JNPF-common-layout-main JNPF-flex-main"> <div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head"> <div class="JNPF-common-head">
<div> <div>
<el-button type="text" icon="el-icon-plus" @click="addOrUpdateHandle()"> <el-button type="text" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">
</el-button> </el-button>
<el-button type="text" icon="el-icon-download" @click="exportData()"> <el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">
</el-button> </el-button>
<el-button type="text" icon="el-icon-download" @click=""> <el-button type="text" v-has="'btn_upload'" icon="el-icon-download" @click="">
</el-button> </el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()"> <el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">
</el-button> </el-button>
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
@ -137,12 +137,12 @@
<el-button type="text" <el-button type="text"
@click="addOrUpdateHandle2(scope.row.id)">审核 @click="addOrUpdateHandle2(scope.row.id)">审核
</el-button> </el-button>
<el-button type="text" <el-button type="text" v-has="'btn_edit'"
@click="addOrUpdateHandle(scope.row.id)">编辑 @click="addOrUpdateHandle(scope.row.id)">编辑
</el-button> </el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)"> <el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">
</el-button> </el-button>
<el-button type="text" <el-button type="text" v-has="'btn_detail'"
@click="goDetail(scope.row.id)">详情 @click="goDetail(scope.row.id)">详情
</el-button> </el-button>
</template> </template>

@ -25,13 +25,13 @@
<div class="JNPF-common-layout-main JNPF-flex-main"> <div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head"> <div class="JNPF-common-head">
<div> <div>
<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()"> <el-button type="primary" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">
</el-button> </el-button>
<el-button type="text" icon="el-icon-download" @click="exportData()"> <el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">
</el-button> </el-button>
<el-button type="text" icon="el-icon-download" @click=""> <el-button type="text" v-has="'btn_upload'" icon="el-icon-download" @click="">
</el-button> </el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()"> <el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">
</el-button> </el-button>
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
@ -68,9 +68,9 @@
<el-table-column prop="creatortime" label="创建时间" width="0" align="center" sortable/> <el-table-column prop="creatortime" label="创建时间" width="0" align="center" sortable/>
<el-table-column label="操作" fixed="right" width="100"> <el-table-column label="操作" fixed="right" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row.id)"> <el-button type="text" v-has="'btn_edit'" @click="addOrUpdateHandle(scope.row.id)">
</el-button> </el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)"> <el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>

@ -25,13 +25,13 @@
<div class="JNPF-common-layout-main JNPF-flex-main"> <div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head"> <div class="JNPF-common-head">
<div> <div>
<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()"> <el-button type="primary" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">
</el-button> </el-button>
<el-button type="text" icon="el-icon-download" @click="exportData()"> <el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">
</el-button> </el-button>
<el-button type="text" icon="el-icon-download" @click=""> <el-button type="text" v-has="'btn_upload'" icon="el-icon-download" @click="">
</el-button> </el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()"> <el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">
</el-button> </el-button>
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
@ -75,10 +75,10 @@
<el-table-column label="操作" fixed="right" <el-table-column label="操作" fixed="right"
width="100"> width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" <el-button type="text" v-has="'btn_edit'"
@click="addOrUpdateHandle(scope.row.id)">编辑 @click="addOrUpdateHandle(scope.row.id)">编辑
</el-button> </el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)"> <el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>

Loading…
Cancel
Save