李扬

master/src/main/java/com/ruoyi/project/system/controller/SysPlantController.java

@@ -67,8 +67,12 @@ public class SysPlantController extends BaseController
             // 如果是超级管理员，则不过滤数据
             if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin())
             {
-                sysPlant.setPlantId(currentUser.getUserId());
-                list = sysPlantService.selectSysMyPlantList(sysPlant);
+                if (currentUser.getDataScope().equals("1")) {
+                    list = sysPlantService.selectSysPlantList(sysPlant);
+                }else {
+                    sysPlant.setPlantId(currentUser.getUserId());
+                    list = sysPlantService.selectSysMyPlantList(sysPlant);
+                }
             }else {
                 list = sysPlantService.selectSysPlantList(sysPlant);
             }