bonus
/
Bonus-Cloud-Houqin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

替换 mgr_role_canteen 表为 sys_role_canteen 

替换 mgr_role_warehouse 表为 sys_role_warehouse
This commit is contained in:
gaowdong 2025-03-14 13:39:37 +08:00
parent c040602a3c
commit 0a14a5e77a
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/canteen/service/impl/AllocCanteenServiceImpl.java
View File

@ -207,7 +207,7 @@ public class AllocCanteenServiceImpl extends ServiceImpl<AllocCanteenMapper, All
treeNode.setName(canteen.getTreeName()); treeNode.setName(canteen.getTreeName());
treeNode.setParentId(canteen.getParentId()); treeNode.setParentId(canteen.getParentId());
treeNode.putExtra("treeType", canteen.getTreeType()); treeNode.putExtra("treeType", canteen.getTreeType());
treeNode.putExtra("halfSelect", canteen.getHalfSelect()); // treeNode.putExtra("halfSelect", canteen.getHalfSelect());
}); });
} }

14
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/api/MgrAuthApi.java
View File

@ -140,7 +140,7 @@ public class MgrAuthApi {
merchantVO.setTreeName(merchant.getMerchantName()); merchantVO.setTreeName(merchant.getMerchantName());
merchantVO.setTreeType(DataTreeTypeEnum.MERCHANT.getKey()); merchantVO.setTreeType(DataTreeTypeEnum.MERCHANT.getKey());
merchantVO.setBizType(0); merchantVO.setBizType(0);
merchantVO.setHalfSelect(LeConstants.COMMON_YES); // merchantVO.setHalfSelect(LeConstants.COMMON_YES);
list.add(merchantVO); list.add(merchantVO);
List<AllocAreaVO> allocAreaList = this.allocCanteenApi.listAreaByUserRole(mgrUserAuthPO); List<AllocAreaVO> allocAreaList = this.allocCanteenApi.listAreaByUserRole(mgrUserAuthPO);
allocAreaList.forEach((area) -> { allocAreaList.forEach((area) -> {
@ -150,7 +150,7 @@ public class MgrAuthApi {
areaVO.setTreeName(area.getAreaName()); areaVO.setTreeName(area.getAreaName());
areaVO.setTreeType(DataTreeTypeEnum.AREA.getKey()); areaVO.setTreeType(DataTreeTypeEnum.AREA.getKey());
areaVO.setBizType(0); areaVO.setBizType(0);
areaVO.setHalfSelect(LeConstants.COMMON_YES); // areaVO.setHalfSelect(LeConstants.COMMON_YES);
list.add(areaVO); list.add(areaVO);
}); });
List<AllocCanteenVO> canteenList = this.allocCanteenApi.listCanteenByUserRole(); List<AllocCanteenVO> canteenList = this.allocCanteenApi.listCanteenByUserRole();
@ -161,7 +161,7 @@ public class MgrAuthApi {
canteenVO.setTreeName(canteen.getCanteenName()); canteenVO.setTreeName(canteen.getCanteenName());
canteenVO.setTreeType(DataTreeTypeEnum.CANTEEN.getKey()); canteenVO.setTreeType(DataTreeTypeEnum.CANTEEN.getKey());
canteenVO.setBizType(canteen.getCanteenType()); canteenVO.setBizType(canteen.getCanteenType());
canteenVO.setHalfSelect(LeConstants.COMMON_YES); // canteenVO.setHalfSelect(LeConstants.COMMON_YES);
list.add(canteenVO); list.add(canteenVO);
}); });
List<AllocStallVO> stallList = this.allocCanteenApi.listStallByUserRole(); List<AllocStallVO> stallList = this.allocCanteenApi.listStallByUserRole();
@ -172,7 +172,7 @@ public class MgrAuthApi {
stallVO.setTreeName(stall.getStallName()); stallVO.setTreeName(stall.getStallName());
stallVO.setTreeType(DataTreeTypeEnum.STALL.getKey()); stallVO.setTreeType(DataTreeTypeEnum.STALL.getKey());
stallVO.setBizType(stall.getStallType()); stallVO.setBizType(stall.getStallType());
stallVO.setHalfSelect(LeConstants.COMMON_YES); // stallVO.setHalfSelect(LeConstants.COMMON_YES);
list.add(stallVO); list.add(stallVO);
}); });
return list; return list;
@ -238,9 +238,9 @@ public class MgrAuthApi {
}); });
} }
if (ObjectUtil.equal(canteen.getHalfSelect(), LeConstants.COMMON_YES)) { // if (ObjectUtil.equal(canteen.getHalfSelect(), LeConstants.COMMON_YES)) {
canteenStallList.add(canteen.getId() + "_-1"); // canteenStallList.add(canteen.getId() + "_-1");
} // }
}); });
} else { } else {