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/VnoticeUserServiceImpl.java

@@ -55,20 +55,20 @@ public class VnoticeUserServiceImpl extends ServiceImpl<VnoticeUserMapper, Vnoti
             //加载全部
             PageHelper.startPage(page.getPageNum(), page.getPageSize());
             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));
+            long count = list.stream().filter(x -> x.getIsRead() == 0).count();
             PageInfo<VnoticeUser> pageInfo = new PageInfo<VnoticeUser>(list);
             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));
+            count = list.stream().filter(x -> x.getIsRead() == 0).count();
             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));
+            count = list.stream().filter(x -> x.getIsRead() == 0).count();
             PageInfo<VnoticeUser> pageInfo2 = new PageInfo<VnoticeUser>(list);
             map.clear();
             map.put("emergencyList", pageInfo2);