替换 mgr_role_canteen 表为 sys_role_canteen
替换 mgr_role_warehouse 表为 sys_role_warehouse
This commit is contained in:
parent
c040602a3c
commit
0a14a5e77a
|
|
@ -207,7 +207,7 @@ public class AllocCanteenServiceImpl extends ServiceImpl<AllocCanteenMapper, All
|
|||
treeNode.setName(canteen.getTreeName());
|
||||
treeNode.setParentId(canteen.getParentId());
|
||||
treeNode.putExtra("treeType", canteen.getTreeType());
|
||||
treeNode.putExtra("halfSelect", canteen.getHalfSelect());
|
||||
// treeNode.putExtra("halfSelect", canteen.getHalfSelect());
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -140,7 +140,7 @@ public class MgrAuthApi {
|
|||
merchantVO.setTreeName(merchant.getMerchantName());
|
||||
merchantVO.setTreeType(DataTreeTypeEnum.MERCHANT.getKey());
|
||||
merchantVO.setBizType(0);
|
||||
merchantVO.setHalfSelect(LeConstants.COMMON_YES);
|
||||
// merchantVO.setHalfSelect(LeConstants.COMMON_YES);
|
||||
list.add(merchantVO);
|
||||
List<AllocAreaVO> allocAreaList = this.allocCanteenApi.listAreaByUserRole(mgrUserAuthPO);
|
||||
allocAreaList.forEach((area) -> {
|
||||
|
|
@ -150,7 +150,7 @@ public class MgrAuthApi {
|
|||
areaVO.setTreeName(area.getAreaName());
|
||||
areaVO.setTreeType(DataTreeTypeEnum.AREA.getKey());
|
||||
areaVO.setBizType(0);
|
||||
areaVO.setHalfSelect(LeConstants.COMMON_YES);
|
||||
// areaVO.setHalfSelect(LeConstants.COMMON_YES);
|
||||
list.add(areaVO);
|
||||
});
|
||||
List<AllocCanteenVO> canteenList = this.allocCanteenApi.listCanteenByUserRole();
|
||||
|
|
@ -161,7 +161,7 @@ public class MgrAuthApi {
|
|||
canteenVO.setTreeName(canteen.getCanteenName());
|
||||
canteenVO.setTreeType(DataTreeTypeEnum.CANTEEN.getKey());
|
||||
canteenVO.setBizType(canteen.getCanteenType());
|
||||
canteenVO.setHalfSelect(LeConstants.COMMON_YES);
|
||||
// canteenVO.setHalfSelect(LeConstants.COMMON_YES);
|
||||
list.add(canteenVO);
|
||||
});
|
||||
List<AllocStallVO> stallList = this.allocCanteenApi.listStallByUserRole();
|
||||
|
|
@ -172,7 +172,7 @@ public class MgrAuthApi {
|
|||
stallVO.setTreeName(stall.getStallName());
|
||||
stallVO.setTreeType(DataTreeTypeEnum.STALL.getKey());
|
||||
stallVO.setBizType(stall.getStallType());
|
||||
stallVO.setHalfSelect(LeConstants.COMMON_YES);
|
||||
// stallVO.setHalfSelect(LeConstants.COMMON_YES);
|
||||
list.add(stallVO);
|
||||
});
|
||||
return list;
|
||||
|
|
@ -238,9 +238,9 @@ public class MgrAuthApi {
|
|||
});
|
||||
}
|
||||
|
||||
if (ObjectUtil.equal(canteen.getHalfSelect(), LeConstants.COMMON_YES)) {
|
||||
canteenStallList.add(canteen.getId() + "_-1");
|
||||
}
|
||||
// if (ObjectUtil.equal(canteen.getHalfSelect(), LeConstants.COMMON_YES)) {
|
||||
// canteenStallList.add(canteen.getId() + "_-1");
|
||||
// }
|
||||
|
||||
});
|
||||
} else {
|
||||
|
|
|
|||
Loading…
Reference in New Issue