Merge branch 'master' of http://118.178.224.202:3000/ewide/ewide_core

Api/Ewide.Core/Service/Notice/SysNoticeService.cs

@@ -255,10 +255,9 @@ WHERE SNU.UserId = @UserId AND SN.Status = @Status";
         [HttpGet("/sysNotice/unread")]
         public async Task<int> GetUnreadCount()
         {
-            //删除 或者 草稿都不让显示
-            var noticeList = await _sysNoticeRep.Where(u => u.Status != (int)NoticeStatus.DELETED&& u.Status != (int)NoticeStatus.DRAFT).Select(s => s.Id).ToListAsync();
-            var noticeUserList = await _sysNoticeUserRep.Where(u => u.UserId == _userManager.UserId && noticeList.Contains(u.NoticeId) && u.ReadStatus == (int)NoticeUserStatus.UNREAD).ToListAsync();
-            return noticeUserList.Count();
+            //删除 或者 草稿  未发布 都不让显示
+            var noticeList = await _sysNoticeRep.Where(u => u.Status == (int)NoticeStatus.PUBLIC).Select(s => s.Id).ToListAsync();
+            return  await _sysNoticeUserRep.Where(u => u.UserId == _userManager.UserId && noticeList.Contains(u.NoticeId) && u.ReadStatus == (int)NoticeUserStatus.UNREAD).CountAsync();
         }
 
         /// <summary>

web-react/src/pages/system/account/setting/satety/password.jsx

@@ -23,13 +23,6 @@ export default class form extends Component {
 
     open = () => {
         this.setState({ visible: true })
-    }
-
-    /**
-     * mount后回调
-     */
-    componentDidMount() {
-        this.props.created && this.props.created(this)
         api.getPwdRule({}).then(({ success, data, message }) => {
             if (success) {
                 const { pattern, descriptions } = data
@@ -43,6 +36,13 @@ export default class form extends Component {
         })
     }
 
+    /**
+     * mount后回调
+     */
+    componentDidMount() {
+        this.props.created && this.props.created(this)
+    }
+
     updatePwd(values) {
         let { password, newPassword } = values.current.getFieldsValue()
         password = encryptByRSA(password, RSA_PUBLIC_KEY)