Jelajahi Sumber

bugfix:房间信息查询时 新建的校区下没有房间数据也能查询到数据,应该显示”无数据“才对

bing 1 tahun lalu
induk
melakukan
5858484ce8

+ 3 - 5
ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/service/impl/PtAreaServiceImpl.java

@@ -67,16 +67,14 @@ public class PtAreaServiceImpl implements IPtAreaService {
     public List<PtAreaVo> queryListLD(Long areaId) {
         PtAreaVo ptAreaVo = queryById(areaId);
         if(ptAreaVo==null) return ListUtil.empty();
-        if("04".equals(ptAreaVo.getAreaType())) {
+        if(BuildAreaTypeEnum.LC.code().equals(ptAreaVo.getAreaType())) {
             List<PtAreaVo> rs = new ArrayList<>();
             rs.add(ptAreaVo);
             return rs;
         }
         LambdaQueryWrapper<PtArea> lqw = Wrappers.lambdaQuery();
-        if(ptAreaVo.getParentId() != 0L){
-            lqw.likeRight(PtArea::getAncestors, ptAreaVo.getAncestors()+","+ptAreaVo.getAreaId());
-        }
-        lqw.eq(PtArea::getAreaType, "04");
+        lqw.likeRight(PtArea::getAncestors, ptAreaVo.getAncestors()+","+ptAreaVo.getAreaId());
+        lqw.eq(PtArea::getAreaType, BuildAreaTypeEnum.LC.code());
         return baseMapper.selectVoList(lqw);
     }
 

+ 2 - 0
ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/service/impl/PtCampusServiceImpl.java

@@ -126,6 +126,8 @@ public class PtCampusServiceImpl implements IPtCampusService {
                     ptArea.setAreaName(ptSchoolVo.getSchoolName());
                     ptArea.setAreaId(ptSchoolVo.getSchoolId());
                     ptArea.setAreaType(BuildAreaTypeEnum.XX.code());
+                    ptArea.setParentId(0L);
+                    ptArea.setAncestors("0");
                 }else{
                     throw new ServiceException("学校不存在");
                 }