From c4c88b0ec16be3240d691ad4fd3cf01b35a12e02 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 24 五月 2025 11:02:57 +0800
Subject: [PATCH] 排班功能模块，其中查询条件用户列表查询中，不应该查出超级管理员

---
 pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/schedule/ScheduleCtrl.java |   36 +++++++++++++++++++++++-------------
 1 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/schedule/ScheduleCtrl.java b/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/schedule/ScheduleCtrl.java
index 7f13c65..7a26b21 100644
--- a/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/schedule/ScheduleCtrl.java
+++ b/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/schedule/ScheduleCtrl.java
@@ -1,5 +1,6 @@
 package com.dy.pmsProduct.schedule;
 
+import cn.hutool.json.JSONObject;
 import com.alibaba.excel.EasyExcel;
 import com.dy.common.aop.SsoPowerAop;
 import com.dy.common.webUtil.BaseResponse;
@@ -20,7 +21,6 @@
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 鎺掔彮
@@ -38,7 +38,7 @@
     }
 
     @PostMapping(path="save")
-    @SsoPowerAop(power = "-1")
+    @SsoPowerAop(power = "10200009")
     @Log("淇濆瓨鎺掔彮")
     public BaseResponse<Boolean> save(@RequestBody @Valid PrSchedule schedule){
         int count = sv.save(schedule);
@@ -55,7 +55,7 @@
      * @return
      */
     @PostMapping(path="update")
-    @SsoPowerAop(power = "-1")
+    @SsoPowerAop(power = "10200009")
     @Log("鏇存柊鎺掔彮")
     public BaseResponse<Boolean> update(@RequestBody @Valid PrSchedule schedule){
         int count = sv.update(schedule);
@@ -72,18 +72,18 @@
      * @return
      */
     @PostMapping(path="selectPlan")
-    @SsoPowerAop(power = "-1")
+    @SsoPowerAop(power = "10200008")
     @Log("鏌ヨ浠诲姟璁″垝鍒楄〃")
-    public BaseResponse<List<Map<String,Object>>> selectPlan(@RequestBody QueryVo vo){
-        List<Map<String,Object>> list = sv.selectPlan(vo) ;
-        return BaseResponseUtils.buildSuccess(list);
+    public BaseResponse<List<JSONObject>> selectPlan(@RequestBody QueryVo vo){
+        List<JSONObject> array = sv.selectPlan(vo) ;
+        return BaseResponseUtils.buildSuccess(array);
     }
     /**
      * 鏍规嵁ID鏌ヨ
      * @return
      */
     @GetMapping(path="one")
-    @SsoPowerAop(power = "-1")
+    @SsoPowerAop(power = "10200008")
     @Log("鏍规嵁ID鏌ヨ鎺掔彮")
     public BaseResponse<PrSchedule> one(Long id){
         PrSchedule schedule=sv.selectById(id);
@@ -96,9 +96,9 @@
      * @return
      */
     @PostMapping(path="some")
-    @SsoPowerAop(power = "-1")
+    @SsoPowerAop(power = "10200008")
     @Log("鍒嗛〉鏌ヨ鎺掔彮")
-    public BaseResponse<QueryResultVo<List<PrSchedule>>> some(@RequestBody com.dy.pmsProduct.schedule.QueryVo vo){
+    public BaseResponse<QueryResultVo<List<PrSchedule>>> some(@RequestBody QueryVo vo){
         QueryResultVo<List<PrSchedule>> list = sv.selectSome(vo) ;
         return BaseResponseUtils.buildSuccess(list);
     }
@@ -107,16 +107,16 @@
      * @return
      */
     @GetMapping(path="getUserList")
-    @SsoPowerAop(power = "-1")
+    @SsoPowerAop(power = "10200008")
     @Log("鏌ヨ绯荤粺涓搷浣滀汉鍛樹俊鎭�")
     public BaseResponse<List<BaUser>> getUserList(){
-        List<BaUser> userList = sv.selectById();
+        List<BaUser> userList = sv.selectAllUsers();
         return BaseResponseUtils.buildSuccess(userList);
     }
 
 
     @PostMapping(path="export")
-    @SsoPowerAop(power = "-1")
+    @SsoPowerAop(power = "10200009")
     @Log("瀵煎嚭鎺掔彮")
     public void exportSchedule(@RequestBody QueryVo queryVo, HttpServletResponse response) throws IOException {
         List<ExcelVo> list = new ArrayList<>();
@@ -148,4 +148,14 @@
         EasyExcel.write(response.getOutputStream(), list.get(0).getClass()).sheet(sheetName)
                 .registerWriteHandler(new CustomCellWriteHandler()).doWrite(list);
     }
+
+    /**
+     * 鏌ヨ鎵�鏈�,瑙﹀睆绔娇鐢ㄤ笉楠岃瘉token
+     * @param queryVo
+     * @return
+     */
+    @PostMapping(path="selectAll")
+    public BaseResponse<List<PrSchedule>> selectAll(@RequestBody QueryVo queryVo) {
+        return BaseResponseUtils.buildSuccess(sv.selectAll(queryVo));
+    }
 }

--
Gitblit v1.8.0