diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java index 719ec7b4..dcd33982 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java @@ -501,6 +501,12 @@ public class PageController { } else { mv.addObject("display", "none"); } + String userAgent = request.getHeader("user-agent"); + // 判断当前使用的设备为移动端还是pc端 + boolean b = DeviceUtil.checkAgentIsMobile(userAgent); + if(b){ + mv.setViewName("pages/split/split-out_mobile"); + } return mv; } diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/SplitUnitServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/SplitUnitServiceImpl.java index 17e24831..8d7e6eb9 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/SplitUnitServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/SplitUnitServiceImpl.java @@ -766,7 +766,14 @@ public class SplitUnitServiceImpl implements SplitUnitService { state = map.get("sstate"); } map.put("sstate", state); - return splitUnitMapper.findSplitInfoPByCondition(map); + List splitInfoPByCondition = splitUnitMapper.findSplitInfoPByCondition(map); + for (SplitInfoP splitInfoP:splitInfoPByCondition + ) { + if(splitInfoP.getBrand() == null){ + splitInfoP.setBrand(""); + } + } + return splitInfoPByCondition; } /** diff --git a/src/main/resources/templates/pages/split/split-out_mobile.html b/src/main/resources/templates/pages/split/split-out_mobile.html new file mode 100644 index 00000000..12730166 --- /dev/null +++ b/src/main/resources/templates/pages/split/split-out_mobile.html @@ -0,0 +1,163 @@ + + + + + layui + + + + + + + +
+
+
+ 搜索信息 +
+
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ + +
+ +
+ +
+
+
+ +
+
+
+
+
+ +
    +
    +
    + + + + + + + + \ No newline at end of file