桌面bug修改(湖南）

service/publicapi/src/main/java/com/founder/publicapi/controller/SkypDesktop/SkypDesktopController.java

@@ -141,15 +141,24 @@ public class SkypDesktopController {
             return new MapRestResult(200,"zjhm为空",null);
         }
         Map<Object, Object> map = new HashMap<>();
+        List<SkMenu> re = new ArrayList<>();
+        //固定的
+        QueryWrapper wrapper1 = new QueryWrapper<>();
+        wrapper1.eq("isDeleted","0");
+        wrapper1.eq("isFixedMenu","1");
+        List<SkMenu> list2 = skMenuMapper.selectList(wrapper1);
+        re.addAll( list2);
         // 新增的
         QueryWrapper wrapper = new QueryWrapper<>();
         wrapper.eq(!StringUtil.isEmpty(zjhm),"zjhm", zjhm);
         wrapper.eq("isDeleted","0");
+        wrapper.eq("isFixedMenu","0");
         List<SkMenu> list = skMenuMapper.selectList(wrapper);
-        map.put("桌面",list);
+        re.addAll(list);
+        map.put("桌面",re);
 
         //查询移入的
-        List<SkMenu> list1 = list.stream().filter(s -> (s.getState().equals("2"))).collect(Collectors.toList());
+        List<SkMenu> list1 = re.stream().filter(s -> (s.getState().equals("2"))).collect(Collectors.toList());
         map.put("移入",list1);
 
         return new MapRestResult(200,"ok",map.size(),map);