通知代码提交

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/UserReadController.java

@@ -12,7 +12,6 @@
  */
 package vip.xiaonuo.disk.controller;
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -29,8 +28,6 @@ import vip.xiaonuo.auth.core.util.StpLoginUserUtil;
 import vip.xiaonuo.common.annotation.CommonLog;
 import vip.xiaonuo.common.pojo.CommonResult;
 import vip.xiaonuo.common.pojo.CommonValidList;
-
-import vip.xiaonuo.disk.domain.CourseOpen;
 import vip.xiaonuo.disk.domain.UserRead;
 import vip.xiaonuo.disk.param.userread.UserReadAddParam;
 import vip.xiaonuo.disk.param.userread.UserReadEditParam;
@@ -161,7 +158,6 @@ public class UserReadController {
         param.put("funcType", funcType);
         param.put("userId", StpLoginUserUtil.getLoginUser().getId());
         Map<String,Object> result=userReadService.getCount(param);
-
         return CommonResult.data(result);
     }
 

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/mapping/UserReadMapper.xml

@@ -28,10 +28,10 @@
 
     <select id="getNoticeCount" resultType="java.util.Map">
         SELECT
-            count(DISTINCT b.ID) AS unreadCount
+            count(DISTINCT a.NOTICE_ID)-count(DISTINCT b.USER_ID) AS unreadCount
         FROM
             notice a
-        LEFT JOIN user_read b ON a.NOTICE_ID=b.MAIN_ID AND b.USER_ID =#{userId}
+        LEFT JOIN user_read b ON a.NOTICE_ID=b.MAIN_ID AND b.USER_ID =#{userId}  AND b.FUNC_TYPE='2'
         where a.NOTICE_STATUS=1 and a.DELETE_FLAG='NOT_DELETE'
     </select>
 </mapper>