root/wuHanXinRui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码更新

Browse Source
This commit is contained in:
lyd
2022-11-17 17:33:00 +08:00
parent 8a55b97e05
commit ffb6165616
2 changed files with 41 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mes/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/UserServiceImpl.java
View File

@@ -101,15 +101,15 @@ public class UserServiceImpl implements UserService {
User user = userRepository.findById(resources.getId()).orElseGet(User::new);
ValidationUtil.isNull(user.getId(), "User", "id", resources.getId());
User user1 = userRepository.findByUsername(resources.getUsername());
User user2 = userRepository.findByEmail(resources.getEmail());
// User user2 = userRepository.findByEmail(resources.getEmail());
if (user1 != null && !user.getId().equals(user1.getId())) {
throw new EntityExistException(User.class, "username", resources.getUsername());
}
if (user2 != null && !user.getId().equals(user2.getId())) {
throw new EntityExistException(User.class, "email", resources.getEmail());
}
// if (user2 != null && !user.getId().equals(user2.getId())) {
// throw new EntityExistException(User.class, "email", resources.getEmail());
// }
// 如果用户的角色改变
if (!resources.getRoles().equals(user.getRoles())) {
redisUtils.del(CacheKey.DATA_USER + resources.getId());

49
mes/qd/src/views/system/user/index.vue
View File

@@ -70,18 +70,18 @@
>
<el-form ref="form" :inline="true" :model="form" :rules="rules" size="mini" label-width="100px">
<el-form-item label="用户名" prop="username">
<el-input style="width: 200px;" v-model="form.username" />
<el-input v-model="form.username" style="width: 200px;" />
</el-form-item>
<el-form-item label="电话" prop="phone">
<el-input v-model.number="form.phone" style="width: 200px;"/>
<el-input v-model.number="form.phone" style="width: 200px;" />
</el-form-item>
<el-form-item label="昵称" prop="nickName">
<el-input v-model="form.nickName" style="width: 200px;"/>
<el-input v-model="form.nickName" style="width: 200px;" />
</el-form-item>
<el-form-item label="邮箱" prop="email">
<el-input v-model="form.email" style="width: 200px;"/>
<el-input v-model="form.email" style="width: 200px;" />
</el-form-item>
<el-form-item label="* 部门" prop="dept.id">
<el-form-item label="部门" prop="dept.id" :rules="[{ required: true, message: '请选择部门', trigger: 'change' }]">
<treeselect
v-model="form.dept.id"
:options="depts"
@@ -91,9 +91,9 @@
/>
</el-form-item>
<el-form-item label="密码" prop="password">
<el-input v-model="form.password" style="width: 200px;"/>
<el-input v-model="form.password" style="width: 200px;" show-password/>
</el-form-item>
<el-form-item label="岗位" prop="jobs" v-if="false">
<el-form-item v-if="false" label="岗位" prop="jobs">
<el-select
v-model="jobDatas"
style="width: 200px"
@@ -127,12 +127,16 @@
</el-radio-group>
</el-form-item>
<el-form-item label="外部标识" prop="extId">
<el-input v-model="form.extId" style="width: 200px;"/>
<el-input v-model="form.extId" style="width: 200px;" />
</el-form-item>
<el-form-item label="外部用户标识" prop="extId">
<el-input v-model="form.extuserId" style="width: 200px;"/>
<el-input v-model="form.extuserId" style="width: 200px;" />
</el-form-item>
<el-form-item style="margin-bottom: 0;" label="* 角色" prop="roles">
<el-form-item
style="margin-bottom: 0;"
prop="roles"
label="角色"
>
<el-select
v-model="roleDatas"
style="width: 516px"
@@ -167,7 +171,7 @@
<el-table-column :selectable="checkboxT" type="selection" width="55" />
<el-table-column show-overflow-tooltip prop="username" label="用户名" />
<el-table-column show-overflow-tooltip prop="nickName" label="昵称" />
<!-- <el-table-column show-overflow-tooltip prop="password" label="密码" />-->
<!-- <el-table-column show-overflow-tooltip prop="password" label="密码" />-->
<el-table-column prop="gender" label="性别" />
<el-table-column show-overflow-tooltip prop="phone" width="100" label="电话" />
<el-table-column show-overflow-tooltip width="135" prop="email" label="邮箱" />
@@ -292,7 +296,7 @@ export default {
])
},
created() {
this.crud.msg.add = '新增成功，默认密码：123456'
this.crud.msg.add = '新增成功'
},
mounted: function() {
const that = this
@@ -365,6 +369,9 @@ export default {
userJobs.push(data)
})
},
[CRUD.HOOK.afterRefresh]() {
console.log(this.crud.data)
},
// 提交前做的操作
[CRUD.HOOK.afterValidateCU](crud) {
if (!crud.form.dept.id) {
@@ -507,3 +514,21 @@ export default {
line-height: 30px;
}
</style>
<style scoped>
.title{
color: #606266;
font-family: NotoSansHans-Regula;
font-size: 14px;
display:inline-block;
text-align: right;
width: 70px;
}
.titleRequired:before {
content: '*';
color: #F56C6C;
left: 0px;
top: 6px;
font-size: 20px;
position: absolute;
}
</style>