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-16 18:10:59 +08:00
parent 4092273220
commit 7c22c914ad
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mes/hd/nladmin-system/src/main/java/org/nl/modules/system/rest/UserController.java
View File

@@ -16,6 +16,7 @@
package org.nl.modules.system.rest; package org.nl.modules.system.rest;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ObjectUtil;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@@ -110,7 +111,10 @@ public class UserController {
public ResponseEntity<Object> create(@Validated @RequestBody User resources){ public ResponseEntity<Object> create(@Validated @RequestBody User resources){
checkLevel(resources); checkLevel(resources);
// 默认密码 123456 // 默认密码 123456
resources.setPassword(passwordEncoder.encode("123456")); if (ObjectUtil.isEmpty(resources.getPassword()))
resources.setPassword(passwordEncoder.encode("123456"));
else
resources.setPassword(passwordEncoder.encode(resources.getPassword()));
userService.create(resources); userService.create(resources);
return new ResponseEntity<>(HttpStatus.CREATED); return new ResponseEntity<>(HttpStatus.CREATED);
} }

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

@@ -147,7 +147,7 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="重置密码" prop="extId"> <el-form-item label="密码" prop="password">
<el-input v-model="form.password" style="width: 200px;"/> <el-input v-model="form.password" style="width: 200px;"/>
</el-form-item> </el-form-item>
</el-form> </el-form>
@@ -167,7 +167,7 @@
<el-table-column :selectable="checkboxT" type="selection" width="55" /> <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="username" label="用户名" />
<el-table-column show-overflow-tooltip prop="nickName" 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 prop="gender" label="性别" />
<el-table-column show-overflow-tooltip prop="phone" width="100" label="电话" /> <el-table-column show-overflow-tooltip prop="phone" width="100" label="电话" />
<el-table-column show-overflow-tooltip width="135" prop="email" label="邮箱" /> <el-table-column show-overflow-tooltip width="135" prop="email" label="邮箱" />
@@ -297,6 +297,9 @@ export default {
], ],
phone: [ phone: [
{ required: true, trigger: 'blur', validator: validPhone } { required: true, trigger: 'blur', validator: validPhone }
],
password: [
{ max: 20, message: '长度最多 20 个字符', trigger: 'change' }
] ]
} }
} }
@@ -354,6 +357,9 @@ export default {
this.jobDatas = [] this.jobDatas = []
this.roleDatas = [] this.roleDatas = []
}, },
[CRUD.HOOK.afterRefresh]() {
console.log(this.crud.data)
},
// 初始化编辑时候的角色与岗位 // 初始化编辑时候的角色与岗位
[CRUD.HOOK.beforeToEdit](crud, form) { [CRUD.HOOK.beforeToEdit](crud, form) {
this.getJobs(this.form.dept.id) this.getJobs(this.form.dept.id)