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

冲突

Browse Source
This commit is contained in:
liyd
2022-12-07 18:55:49 +08:00
parent 8274c4654b e22f3008b1
commit c875eb0bfe
5 changed files with 100 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms/nladmin-system/src/main/java/org/nl/sso/system/domain/vo/UserVo.java
View File

@@ -97,4 +97,8 @@ public class UserVo extends BaseDto implements Serializable {
this.depts = Arrays.stream(split).map(a->Long.valueOf(a)).collect(Collectors.toList());
}
}
public void setPassword(String password) {
this.password = null;
}
}

16
lms/nladmin-system/src/main/java/org/nl/sso/system/rest/DeptController.java
View File

@@ -17,13 +17,12 @@ package org.nl.sso.system.rest;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.dev33.satoken.annotation.SaMode;
import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.nl.modules.common.exception.BadRequestException;
import org.apache.commons.lang3.StringUtils;
import org.nl.modules.common.utils.PageUtil;
import org.nl.modules.logging.annotation.Log;
import org.nl.sso.system.domain.Dept;
@@ -66,8 +65,18 @@ public class DeptController {
if (criteria.getPid() == null){
criteria.setPidIsNull(true);
}
Boolean hasChild = false;
if (StringUtils.isNotEmpty(criteria.getName()) || StringUtils.isNotEmpty(criteria.getIs_used())){
criteria.setPidIsNull(null);
hasChild=true;
}
List<Dept> deptDtos = deptService.queryAll(criteria, true);
List<DeptVo> deptVos = CopyUtil.copyList(deptDtos, DeptVo.class);
if (hasChild){
deptVos.forEach(a->{
a.setHasChildren(false);
});
}
return new ResponseEntity<>(PageUtil.toPage(deptVos, deptVos.size()),HttpStatus.OK);
}
@@ -101,9 +110,6 @@ public class DeptController {
@PostMapping
// @SaCheckPermission("dept:add")
public ResponseEntity<Object> create(@Validated @RequestBody Dept resources){
if (resources.getDept_id() != null) {
throw new BadRequestException("A new "+ ENTITY_NAME +" cannot already have an ID");
}
deptService.create(resources);
return new ResponseEntity<>(HttpStatus.CREATED);
}

35
lms/nladmin-system/src/main/java/org/nl/sso/system/service/impl/UserServiceImpl.java
View File

@@ -146,9 +146,12 @@ public class UserServiceImpl implements UserService {
List<Long> depts = resources.getDepts();
List<Long> roles = resources.getRoles();
JSONObject currentUser = WQLObject.getWQLObject("sys_user").query("username = '" + resources.getUsername() + "'").uniqueResult(0);
userRelateService.inserDeptRelate(currentUser.getLong("user_id"),new HashSet(depts));
userRelateService.inserRoleRelate(currentUser.getLong("user_id"),new HashSet(roles));
if (!CollectionUtils.isEmpty(depts)){
userRelateService.inserDeptRelate(currentUser.getLong("user_id"),new HashSet(depts));
}
if (!CollectionUtils.isEmpty(roles)){
userRelateService.inserRoleRelate(currentUser.getLong("user_id"),new HashSet(roles));
}
}
@@ -162,7 +165,9 @@ public class UserServiceImpl implements UserService {
if("0".equals(resources.getIs_used())){
onlineUserService.kickOutForUsername(resources.getUsername());
}
resources.setPassword(SaSecureUtil.md5BySalt(resources.getPassword(), "salt"));
if (StringUtils.isNotEmpty(resources.getPassword())){
resources.setPassword(SaSecureUtil.md5BySalt(resources.getPassword(), "salt"));
}
resources.setUpdate_time(new Date());
resources.setUpdate_optid(user.getId());
resources.setUpdate_optname(user.getUsername());
@@ -172,16 +177,20 @@ public class UserServiceImpl implements UserService {
//更新部门用户
List<Long> depts = resources.getDepts();
List<Long> roles = resources.getRoles();
userRelateService.updateDeptRelate(resources.getUser_id(),new HashSet(depts));
userRelateService.updateRoleRelate(resources.getUser_id(),new HashSet(roles));
// 如果用户的角色改变
if (!resources.getRoles().equals(user.getRoles())) {
redisUtils.del(CacheKey.DATA_USER + resources.getUser_id());
redisUtils.del(CacheKey.MENU_USER + resources.getUser_id());
redisUtils.del(CacheKey.ROLE_AUTH + resources.getUser_id());
if (!CollectionUtils.isEmpty(depts)){
userRelateService.updateDeptRelate(resources.getUser_id(),new HashSet(depts));
}
if (!CollectionUtils.isEmpty(roles)){
userRelateService.updateRoleRelate(resources.getUser_id(),new HashSet(roles));
// 如果用户的角色改变
if (!resources.getRoles().equals(user.getRoles())) {
redisUtils.del(CacheKey.DATA_USER + resources.getUser_id());
redisUtils.del(CacheKey.MENU_USER + resources.getUser_id());
redisUtils.del(CacheKey.ROLE_AUTH + resources.getUser_id());
}
}
}

63
lms/nladmin-ui/src/views/system/dept/index.vue
View File

@@ -37,7 +37,7 @@
width="500px"
>
<el-form ref="form" inline :model="form" :rules="rules" size="mini" label-width="80px">
<el-form-item label="部门编码" prop="code">
<el-form-item v-if="!crud.status.add" label="部门编码" prop="code">
<el-input v-model="form.code" :disabled="true" style="width: 370px;" />
</el-form-item>
<el-form-item label="部门名称" prop="name">
@@ -103,34 +103,28 @@
<!-- <el-table-column label="编码" prop="code" />-->
<el-table-column label="名称" prop="name" />
<el-table-column label="排序" prop="dept_sort" />
<el-table-column label="状态" align="center" prop="is_used">
<el-table-column label="状态" align="center" prop="enabled">
<template slot-scope="scope">
<el-switch
v-model="scope.row.is_used"
:disabled="scope.row.id === 1"
active-color="#409EFF"
inactive-color="#F56C6C"
active-value="1"
inactive-value="0"
@change="changeEnabled(scope.row, scope.row.enabled,)"
/>
<span :style="{'color': caseStatusColorFilter(scope.row.is_used)}">{{ enabledTypeOptions.find(item => {return item.key == scope.row.is_used}).display_name }}</span>
</template>
</el-table-column>
<el-table-column prop="create_time" label="创建日期" />
<el-table-column
v-permission="['admin','dept:edit','dept:del']"
label="操作"
width="130px"
width="200"
align="center"
fixed="right"
>
<template slot-scope="scope">
<udOperation
:data="scope.row"
:permission="permission"
:disabled-dle="scope.row.id === 1"
msg="确定删除吗,如果存在下级节点则一并删除，此操作不能撤销！"
/>
<el-button size="mini" type="text" icon="el-icon-edit" @click="crud.toEdit(scope.row)">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handdeleted(scope.row)">删除</el-button>
<el-dropdown v-hasPermi="['system:user:resetPwd', 'system:user:edit']" size="mini">
<el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item icon="el-icon-key"><span @click="changeEnabled(scope.row)">{{ enabledTypeOptions.find(item => {return item.key !== scope.row.is_used}).display_name }}部门</span></el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</template>
</el-table-column>
</el-table>
@@ -182,12 +176,18 @@ export default {
del: ['admin', 'dept:del']
},
enabledTypeOptions: [
{ key: '1', display_name: '正常' },
{ key: '1', display_name: '启用' },
{ key: '0', display_name: '禁用' }
]
}
},
methods: {
caseStatusColorFilter(is_used) {
if (is_used === '1') {
return '#378be2'
}
return '#F56C6C'
},
getDeptDatas(tree, treeNode, resolve) {
const params = { pid: tree.dept_id }
setTimeout(() => {
@@ -266,20 +266,29 @@ export default {
return true
},
// 改变状态
changeEnabled(data, val) {
this.$confirm('此操作将 "' + this.dict.label.dept_status[val] + '" ' + data.name + '部门, 是否继续？', '提示', {
changeEnabled(row) {
const satus = this.enabledTypeOptions.find(item => { return item.key !== row.is_used })
this.$confirm('此操作将' + satus.display_name + '部门：' + row.name + ', 是否继续？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
crudDept.edit(data).then(res => {
this.crud.notify(this.dict.label.dept_status[val] + '成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
}).catch(err => {
data.enabled = !data.enabled
console.log(err.response.data.message)
row.is_used = satus.key
crudDept.edit(row).then(res => {
this.crud.toQuery()
this.crud.notify('部门' + row.name + '已' + satus.display_name)
})
})
},
handdeleted(datas) {
this.$confirm(`删除该部门将连带删除所有子部门,确认删除？`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.crud.delAllLoading = true
this.crud.doDelete(datas)
}).catch(() => {
data.enabled = !data.enabled
})
},
checkboxT(row, rowIndex) {

60
lms/nladmin-ui/src/views/system/user/index.vue
View File

@@ -155,13 +155,11 @@
<el-table-column prop="phone" label="电话" :min-width="flexWidth('phone',crud.data,'电话')" />
<el-table-column prop="email" label="邮箱" :min-width="flexWidth('email',crud.data,'邮箱')" />
<el-table-column show-overflow-tooltip prop="deptnames" label="部门" />
<el-table-column
label="启用"
align="center"
prop="is_used"
:formatter="crud.formatIsOrNot"
:min-width="flexWidth('is_used',crud.data,'启用')"
/>
<el-table-column label="状态" align="center" prop="enabled">
<template slot-scope="scope">
<span :style="{'color': caseStatusColorFilter(scope.row.is_used)}">{{ enabledTypeOptions.find(item => {return item.key == scope.row.is_used}).display_name }}</span>
</template>
</el-table-column>
<el-table-column prop="create_time" label="创建日期" :min-width="flexWidth('create_time',crud.data,'创建日期')" />
<el-table-column
label="操作"
@@ -170,17 +168,17 @@
width="200"
>
<template v-if="scope.row.userId !== 1" slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="crud.toEdit(scope.row)(scope.row)">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="crud.toEdit(scope.row)">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handdeleted(scope.row)">删除</el-button>
<el-dropdown v-hasPermi="['system:user:resetPwd', 'system:user:edit']" size="mini" @command="(command) => handleCommand(command, scope.row)">
<el-dropdown v-hasPermi="['system:user:resetPwd', 'system:user:edit']" size="mini">
<el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item icon="el-icon-key">重置密码</el-dropdown-item>
<el-dropdown-item icon="el-icon-key">
<span @click="openDeptDrawer(scope.row)">部门权限</span>
</el-dropdown-item>
<el-dropdown-item icon="el-icon-key">数据权限</el-dropdown-item>
<el-dropdown-item icon="el-icon-key">锁定账号</el-dropdown-item>
<el-dropdown-item icon="el-icon-key"><span @click="resetPassword(scope.row)">重置密码</span></el-dropdown-item>
<el-dropdown-item icon="el-icon-key"><span @click="changeEnabled(scope.row)">{{ enabledTypeOptions.find(item => {return item.key !== scope.row.is_used}).display_name }}账号</span></el-dropdown-item>
<el-dropdown-item icon="el-icon-circle-check">
<span @click="openRoleDrawer(scope.row)">分配角色</span>
</el-dropdown-item>
@@ -341,6 +339,12 @@ export default {
}
})
},
caseStatusColorFilter(is_used) {
if (is_used === '1') {
return '#378be2'
}
return '#F56C6C'
},
handdeleted(datas) {
this.$confirm(`确认删除选中的1条数据?`, '提示', {
confirmButtonText: '确定',
@@ -484,19 +488,18 @@ export default {
this.crud.toQuery()
},
// 改变状态
changeEnabled(data, val) {
this.$confirm('此操作将 "' + this.dict.label.user_status[val] + '" ' + data.username + ', 是否继续？', '提示', {
changeEnabled(row) {
const satus = this.enabledTypeOptions.find(item => { return item.key !== row.is_used })
this.$confirm('此操作将' + satus.display_name + '账号：' + row.username + ', 是否继续？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
crudUser.edit(data).then(res => {
this.crud.notify(this.dict.label.user_status[val] + '成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
}).catch(() => {
data.enabled = !data.enabled
row.is_used = satus.key
crudUser.edit(row).then(res => {
this.crud.toQuery()
this.crud.notify('账号' + row.username + '已' + satus.display_name)
})
}).catch(() => {
data.enabled = !data.enabled
})
},
// 获取弹窗内角色数据
@@ -518,24 +521,15 @@ export default {
return true
},
resetPassword(row) {
row.password = null
this.$prompt('', '重置密码', {
this.$confirm(`确认重置密码？`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
inputPlaceholder: '请输入新的密码',
inputPattern: /^[A-Z|a-z|0-9|(._~!@#$^&*)]{6,20}$/,
inputErrorMessage: '密码格式不正确,只能是6-20位密码',
closeOnClickModal: false
}).then(({ value }) => {
row.password = value
type: 'warning'
}).then(() => {
row.password = '123456'
crudUser.edit(row).then(res => {
this.crud.toQuery()
this.crud.notify('密码重置成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
})
}).catch(() => {
this.$message({
type: 'info',
message: '取消输入'
this.crud.notify('密码重置成功，密码:123456', CRUD.NOTIFICATION_TYPE.SUCCESS)
})
})
},