Explorar el Código

更新权限字符串

baiyun hace 1 año
padre
commit
26964c5538

+ 1 - 1
ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/controller/PtRoomController.java

@@ -76,7 +76,7 @@ public class PtRoomController extends BaseController {
         return R.ok(ptRoomService.queryRoom2AreaList(bo));
     }
 
-    @SaCheckPermission("room:ptRoom:list")
+    @SaCheckPermission("room:ptArea:query")
     @GetMapping("/queryList")
     public R<List<PtRoomVo>> queryList(PtRoomBo bo) {
         return R.ok(ptRoomService.queryList(bo));

+ 3 - 3
ruoyi-modules/ruoyi-hotel/src/main/java/org/dromara/hotel/controller/KfGuestTeamRController.java

@@ -50,7 +50,7 @@ public class KfGuestTeamRController extends BaseController {
     /**
      * 根据客团ID查询客人信息列表
      */
-    @SaCheckPermission("basics:kfGuestTeam:list")
+    @SaCheckPermission("basics:kfTeam:list")
     @GetMapping("/listGuestByTeamId")
     public TableDataInfo<KfGuestTeamRVo> listGuestByTeamId(@RequestParam Long teamId, @RequestParam(required = false) String guestName) {
         return TableDataInfo.build(kfGuestTeamRService.listGuests(teamId, guestName));
@@ -67,9 +67,9 @@ public class KfGuestTeamRController extends BaseController {
     }
 
     /**
-     * 导出客人客团关系列表
+     * 导出团客人员列表
      */
-    @SaCheckPermission("basics:kfGuestTeam:export")
+    @SaCheckPermission("basics:kfGuestTeam:exportTeamGuest")
     @Log(title = "团客人员列表", businessType = BusinessType.EXPORT)
     @PostMapping("/exportTeamGuest")
     public void exportTeamGuest(@RequestParam Long teamId, HttpServletResponse response) {

+ 6 - 6
ruoyi-modules/ruoyi-hotel/src/main/java/org/dromara/hotel/controller/KfOrderController.java

@@ -86,7 +86,7 @@ public class KfOrderController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("business:guestOrder:query")
+    @SaCheckPermission("business:guestOrder:edit")
     @GetMapping("/{id}")
     public R<KfOrderVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {
@@ -116,7 +116,7 @@ public class KfOrderController extends BaseController {
     /**
      * 团客指定房间
      */
-    @SaCheckPermission("business:guestOrder:add")
+    @SaCheckPermission("business:guestOrder:lockRoom")
     @Log(title = "指定房间", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping("roomAssign")
@@ -127,7 +127,7 @@ public class KfOrderController extends BaseController {
     /**
      * 团客锁房
      */
-    @SaCheckPermission("business:guestOrder:add")
+    @SaCheckPermission("business:guestOrder:lockRoom")
     @Log(title = "团客锁房", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping("/lockRoom")
@@ -149,7 +149,7 @@ public class KfOrderController extends BaseController {
     /**
      * 团客身份证报到
      */
-    @SaCheckPermission("business:guestOrder:edit")
+    @SaCheckPermission("business:guestOrder:idCardCheckIn")
     @Log(title = "身份证报到", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping("teamGuestCheckIn")
@@ -160,7 +160,7 @@ public class KfOrderController extends BaseController {
     /**
      * 手机号报到
      */
-    @SaCheckPermission("business:guestOrder:edit")
+    @SaCheckPermission("business:guestOrder:phoneCheckIn")
     @Log(title = "手机号报到", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping("phoneCodeCheckIn")
@@ -195,7 +195,7 @@ public class KfOrderController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("business:guestOrder:remove")
+    @SaCheckPermission("business:guestOrder:lockRoom")
     @Log(title = "散客入住", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")

+ 1 - 1
ruoyi-modules/ruoyi-hotel/src/main/java/org/dromara/hotel/controller/KfTeamController.java

@@ -62,7 +62,7 @@ public class KfTeamController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("basics:kfTeam:query")
+    @SaCheckPermission("basics:kfTeam:list")
     @GetMapping("/{id}")
     public R<KfTeamVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

+ 1 - 1
ruoyi-modules/ruoyi-hotel/src/main/java/org/dromara/hotel/service/impl/KfGuestServiceImpl.java

@@ -124,7 +124,7 @@ public class KfGuestServiceImpl implements IKfGuestService {
     @Override
     public Boolean insertByBo(KfGuestBo bo) {
         KfGuest add = MapstructUtils.convert(bo, KfGuest.class);
-        validEntityBeforeSave(add);
+//        validEntityBeforeSave(add);
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
             bo.setId(add.getId());