WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/fix_2nd_period' into fix_2nd_period

Browse Source
This commit is contained in:
wangzhijiang
2022-12-29 15:21:33 +08:00
parent b574bd6ac7 8f606ffcb4
commit fe129e8621
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
+8 -9
View File
@@ -252,17 +252,16 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
@Override @Override
public IPage<DummyInventoryBaseEO> getPageInfo(Page<DummyInventoryBaseEO> page, QueryWrapper<DummyInventoryBaseEO> queryWrapper) { public IPage<DummyInventoryBaseEO> getPageInfo(Page<DummyInventoryBaseEO> page, QueryWrapper<DummyInventoryBaseEO> queryWrapper) {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
//下面注释掉的代码，是用于区分权限的，2022-12-29变更的时候注释掉的，后面如果要是需要添加权限的时候，再将一下注释的几行代码放开即可-----------------------------------
//系统管理 //系统管理
boolean administrator = sysUserService.isAdministrator(); // boolean administrator = sysUserService.isAdministrator();
if(!administrator){ // if(!administrator){
queryWrapper.and(query->{ // queryWrapper.and(query->{
query.in("create_by",sysUser.getUsername()).in("state",InventoryStateEnum.DRAFT.getValue()) // query.in("create_by",sysUser.getUsername()).in("state",InventoryStateEnum.DRAFT.getValue())
.or().in("state",InventoryStateEnum.ISSUE.getValue()); // .or().in("state",InventoryStateEnum.ISSUE.getValue());
});
}
// queryWrapper.or(query->{
// query.in("state",InventoryStateEnum.ISSUE.getValue());
// }); // });
// }
//--------------------------------------------------------------------------------------------------------------------------------------------------
IPage<DummyInventoryBaseEO> pageList = this.page(page, queryWrapper); IPage<DummyInventoryBaseEO> pageList = this.page(page, queryWrapper);
if (pageList.getRecords().size() != 0) { if (pageList.getRecords().size() != 0) {
List<DummyInventoryBaseEO> records = pageList.getRecords(); List<DummyInventoryBaseEO> records = pageList.getRecords();