Merge remote-tracking branch 'origin/dev' into dev

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserLoginBiz.java

@@ -176,7 +176,7 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> {
 
     public AppUserLogin checkeUserLogin(String username) {
         Example example = new Example(AppUserLogin.class);
-        example.createCriteria().andEqualTo("username", username).andEqualTo("isdel", 0).andEqualTo("status", 0);
+        example.createCriteria().andEqualTo("username", username).andEqualTo("isdel", 0);
         List<AppUserLogin> userLoginList = mapper.selectByExample(example);
         if (userLoginList != null && userLoginList.size() != 0) {
             return userLoginList.get(0);

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/NoticeInfoBiz.java

@@ -118,4 +118,14 @@ public class NoticeInfoBiz extends BaseBiz<NoticeInfoMapper,NoticeInfo> {
 		}
 		return ObjectRestResponse.succ();
 	}
+
+
+	public ObjectRestResponse countObj(NoticeInfoDto noticeInfoDto) {
+		Example example = new Example(NoticeInfo.class);
+		Example.Criteria criteria = example.createCriteria();
+		criteria.andEqualTo("isRead", 1);
+		criteria.andEqualTo("userId", noticeInfoDto.getUserId());
+		criteria.andEqualTo("isDel", 0);
+		return ObjectRestResponse.succ(mapper.selectCountByExample(example));
+	}
 }
\ No newline at end of file

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/web/NoticeInfoWebController.java

@@ -48,4 +48,11 @@ public class NoticeInfoWebController extends BaseController<NoticeInfoBiz,Notice
 		noticeInfoDto.setUserId(Integer.parseInt(getCurrentUserId()));
 		return baseBiz.updateAll(noticeInfoDto);
 	}
+
+	@GetMapping(value = "countObj")
+	public ObjectRestResponse countObj(NoticeInfoDto noticeInfoDto) {
+		noticeInfoDto.setUserId(Integer.parseInt(getCurrentUserId()));
+		return baseBiz.countObj(noticeInfoDto);
+	}
+
 }
\ No newline at end of file