jinxia.mo hai 1 mes
pai
achega
2d98a8ae67

+ 20 - 0
ie-admin/src/main/java/com/ruoyi/web/controller/dz/DzSchoolController.java

@@ -55,6 +55,14 @@ public class DzSchoolController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(DzSchool dzSchool)
     {
+//        if (null==dzSchool.getDeptId()){
+//            dzSchool.setDeptId(getLoginUser().getDeptId());
+//        }
+        if(!UserTypeEnum.Sys.getVal().equals(SecurityUtils.getLoginUser().getUser().getUserType())) {
+            dzSchool.setCampus(true);
+        }else {
+            dzSchool.setCampus(false);
+        }
         startPage();
         List<DzSchool> list= dzSchoolService.selectDzSchoolList(dzSchool);
         //处理省市区
@@ -96,10 +104,22 @@ public class DzSchoolController extends BaseController
         return AjaxResult.success(list);
     }
 
+//    @GetMapping("/getSchoolList")
+//    public AjaxResult getSchoolList(DzSchool dzSchool)
+//    {
+//        if(!UserTypeEnum.Sys.getVal().equals(SecurityUtils.getLoginUser().getUser().getUserType())) {
+//            dzSchool.setCampus(false);
+//        }
+//        List<DzSchool> list = dzSchoolService.selectDzSchoolList(dzSchool);
+//        return AjaxResult.success(list);
+//    }
+
     @GetMapping("/getSchoolList")
     public AjaxResult getSchoolList(DzSchool dzSchool)
     {
         if(!UserTypeEnum.Sys.getVal().equals(SecurityUtils.getLoginUser().getUser().getUserType())) {
+            dzSchool.setCampus(true);
+        }else {
             dzSchool.setCampus(false);
         }
         List<DzSchool> list = dzSchoolService.selectDzSchoolList(dzSchool);