Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

# Conflicts:
#	cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldFileServiceImpl.java

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldFileServiceImpl.java

@@ -391,10 +391,14 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
     public HttpRespMsg getFileList(int mouldId, Integer blongType, UserVO userVO) {
         HttpRespMsg msg = new HttpRespMsg();
         User user = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", userVO.getToken()));
-        List<MouldFile> list = mouldFileMapper.selectList(new QueryWrapper<MouldFile>().eq("model_id", mouldId).eq("blong_type", blongType).orderByDesc("id"));
-//        if(){
-//
-//        }
+        List<MouldFile> list = new ArrayList<>();
+        List<Integer> ids = new ArrayList<>();
+        if(blongType == 4){
+            List<Integer> recursion = recursion(mouldId, ids);
+            list = mouldFileMapper.selectList(new QueryWrapper<MouldFile>().in("model_id", recursion).orderByDesc("id"));
+        }else{
+            list = mouldFileMapper.selectList(new QueryWrapper<MouldFile>().eq("model_id", mouldId).eq("blong_type", blongType).orderByDesc("id"));
+        }
         msg.data = list;
         return msg;
     }

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/VnoticeUserServiceImpl.java

@@ -3,6 +3,7 @@ package com.hssx.cloudmodel.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.hssx.cloudmodel.constant.Constant;
 import com.hssx.cloudmodel.entity.NewsNotice;
 import com.hssx.cloudmodel.entity.NewsNoticeUser;
 import com.hssx.cloudmodel.entity.User;
@@ -48,16 +49,32 @@ public class VnoticeUserServiceImpl extends ServiceImpl<VnoticeUserMapper, Vnoti
         HttpRespMsg msg = new HttpRespMsg();
         List<VnoticeUser> list = new ArrayList<>();
         User user = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", token));
+        List<Map<String, Object>> mapList = new ArrayList<>();
         if (user != null) {
+            Map<String, Object> map = new HashMap<>();
             //加载全部
             PageHelper.startPage(page.getPageNum(), page.getPageSize());
-            list = vnoticeUserMapper.selectList(new QueryWrapper<VnoticeUser>().eq("user_id", user.getId()).orderByDesc("id"));
+            list = vnoticeUserMapper.selectList(new QueryWrapper<VnoticeUser>().eq("user_id", user.getId()).eq("notice_type", Constant.APPROVEL_TYPE).orderByDesc("id"));
             Integer count = vnoticeUserMapper.selectCount(new QueryWrapper<VnoticeUser>().eq("user_id", user.getId()).eq("is_read", 0));
             PageInfo<VnoticeUser> pageInfo = new PageInfo<VnoticeUser>(list);
-            Map<String, Object> map = new HashMap<>();
-            map.put("list", pageInfo);
+            map.put("approvelList", pageInfo);
+            map.put("isNotReadCount", count);
+            mapList.add(map);
+            list = vnoticeUserMapper.selectList(new QueryWrapper<VnoticeUser>().eq("user_id", user.getId()).eq("notice_type",Constant.MAINTAIN_TYPE).orderByDesc("id"));
+            count = vnoticeUserMapper.selectCount(new QueryWrapper<VnoticeUser>().eq("user_id", user.getId()).eq("is_read", 0));
+            PageInfo<VnoticeUser> pageInfo1 = new PageInfo<VnoticeUser>(list);
+            map.clear();
+            map.put("matainList", pageInfo1);
+            map.put("isNotReadCount", count);
+            mapList.add(map);
+            list = vnoticeUserMapper.selectList(new QueryWrapper<VnoticeUser>().eq("user_id", user.getId()).eq("notice_type",Constant.EMERGENCY_TYPE).orderByDesc("id"));
+            count = vnoticeUserMapper.selectCount(new QueryWrapper<VnoticeUser>().eq("user_id", user.getId()).eq("is_read", 0));
+            PageInfo<VnoticeUser> pageInfo2 = new PageInfo<VnoticeUser>(list);
+            map.clear();
+            map.put("emergencyList", pageInfo2);
             map.put("isNotReadCount", count);
-            msg.data = map;
+            mapList.add(map);
+            msg.data = mapList;
         } else {
             msg.setError("用户不存在或者未登录");
         }