fix: 密码不相同,禅道平台汉化,我的待办 功能用例
This commit is contained in:
parent
999e6d2552
commit
5d509d2557
|
@ -524,6 +524,10 @@ public class UserService {
|
|||
private User updateCurrentUserPwd(EditPassWordRequest request) {
|
||||
String oldPassword = CodingUtil.md5(request.getPassword(), "utf-8");
|
||||
String newPassword = request.getNewpassword();
|
||||
String newPasswordMd5 = CodingUtil.md5(newPassword);
|
||||
if(StringUtils.equals(oldPassword,newPasswordMd5)){
|
||||
MSException.throwException(Translator.get("新修改的密码不能与旧密码一样 "));
|
||||
}
|
||||
UserExample userExample = new UserExample();
|
||||
userExample.createCriteria().andIdEqualTo(SessionUtils.getUser().getId()).andPasswordEqualTo(oldPassword);
|
||||
List<User> users = userMapper.selectByExample(userExample);
|
||||
|
|
|
@ -163,15 +163,17 @@ export default {
|
|||
this.getThirdPartyInfo();
|
||||
initAddFuc(data);
|
||||
});
|
||||
this.$get('/issues/follow/' + data.id, response => {
|
||||
this.form.follows = response.data;
|
||||
for (let i = 0; i < response.data.length; i++) {
|
||||
if(response.data[i]===this.currentUser().id){
|
||||
this.showFollow = true;
|
||||
break;
|
||||
if(data&&data.id){
|
||||
this.$get('/issues/follow/' + data.id, response => {
|
||||
this.form.follows = response.data;
|
||||
for (let i = 0; i < response.data.length; i++) {
|
||||
if(response.data[i]===this.currentUser().id){
|
||||
this.showFollow = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
})
|
||||
}
|
||||
},
|
||||
currentUser: () => {
|
||||
return getCurrentUser();
|
||||
|
|
|
@ -78,7 +78,8 @@
|
|||
:label="$t('test_track.issue.platform_status') "
|
||||
prop="platformStatus">
|
||||
<template v-slot="scope">
|
||||
{{ scope.row.platformStatus ? scope.row.platformStatus : '--'}}
|
||||
<span v-if="scope.row.platform ==='Zentao'">{{ scope.row.platformStatus ? issueStatusMap[scope.row.platformStatus] : '--'}}</span>
|
||||
<span v-else>{{ scope.row.platformStatus ? scope.row.platformStatus : '--'}}</span>
|
||||
</template>
|
||||
</ms-table-column>
|
||||
|
||||
|
|
Loading…
Reference in New Issue