ewide/zsxt_nbzs_h5
22
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
自带大佬气场
2021-07-08 18:39:31 +08:00
parent 3fdef68de8 bd09a3f769
commit f29fc47621
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Api/Ewide.Core/Service/Notice/SysNoticeService.cs
View File

@@ -255,10 +255,9 @@ WHERE SNU.UserId = @UserId AND SN.Status = @Status";
[HttpGet("/sysNotice/unread")] [HttpGet("/sysNotice/unread")]
public async Task<int> GetUnreadCount() 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 noticeList = await _sysNoticeRep.Where(u => u.Status == (int)NoticeStatus.PUBLIC).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 await _sysNoticeUserRep.Where(u => u.UserId == _userManager.UserId && noticeList.Contains(u.NoticeId) && u.ReadStatus == (int)NoticeUserStatus.UNREAD).CountAsync();
return noticeUserList.Count();
} }
/// <summary> /// <summary>

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

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