From 1e1e4167d4368a8ae3184ceb9b15d8bcf44bf387 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Fri, 30 Dec 2022 09:32:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SysDataPermissionController.java | 22 +++++ .../permission/ISysDataPermissionService.java | 20 ++++- .../service/permission/dao/SysDataScope.java | 44 ++++++++++ .../dao/mapper/SysDataPermissionMapper.java | 15 ++++ .../dao/mapper/SysDataPermissionMapper.xml | 56 +++++++++++++ .../service/permission/dto/DataScopeEnum.java | 20 +++++ .../impl/SysDataPermissionServiceImpl.java | 84 ++++++++++++++++++- .../system/service/user/ISysUserService.java | 7 ++ .../user/dao/mapper/SysUserMapper.java | 8 ++ .../service/user/dao/mapper/SysUserMapper.xml | 21 +++++ .../user/dto/UserDataPermissionDto.java | 16 +++- .../user/impl/ISysUserServiceImpl.java | 20 +++++ nladmin-ui/src/views/loki/view/index.vue | 1 - .../user/dialog/relevanceDeptDialog.vue | 10 +-- .../user/dialog/relevanceUserDialog.vue | 11 +-- .../user/dialog/showDataPermissionDialog.vue | 2 +- nladmin-ui/src/views/system/user/index.vue | 57 +++++++------ 17 files changed, 371 insertions(+), 43 deletions(-) create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dao/SysDataScope.java create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dto/DataScopeEnum.java diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/permission/SysDataPermissionController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/permission/SysDataPermissionController.java index 7445d3f..a057b70 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/permission/SysDataPermissionController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/permission/SysDataPermissionController.java @@ -1,6 +1,7 @@ package org.nl.system.controller.permission; +import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -85,5 +86,26 @@ public class SysDataPermissionController { return new ResponseEntity<>(dataPermissionService.getDataPermissionOption(),HttpStatus.OK); } + @PostMapping("/saveDataPermission") + @Log("保存数据权限") + @ApiOperation("保存数据权限") + public ResponseEntity saveDataPermission(@RequestBody JSONObject datas){ + dataPermissionService.savePermission(datas); + return new ResponseEntity<>(HttpStatus.CREATED); + } + + @PostMapping("/dataShow") + @Log("查看数据权限") + @ApiOperation("查看数据权限") + public ResponseEntity getDataShow(@RequestBody String id){ + return new ResponseEntity<>(dataPermissionService.getDataShow(id),HttpStatus.OK); + } + + @PostMapping("/dataDetail") + @Log("查看数据明细") + @ApiOperation("查看数据明细") + public ResponseEntity getDataDetail(@RequestBody JSONObject data){ + return new ResponseEntity<>(dataPermissionService.getDataDetail(data),HttpStatus.OK); + } } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/ISysDataPermissionService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/ISysDataPermissionService.java index cd0afb2..58bf417 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/ISysDataPermissionService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/ISysDataPermissionService.java @@ -1,11 +1,14 @@ package org.nl.system.service.permission; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import org.nl.common.domain.query.PageQuery; import org.nl.system.service.dict.dao.Dict; import org.nl.system.service.permission.dao.SysDataPermission; import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.system.service.permission.dao.SysDataScope; import org.nl.system.service.permission.dto.SysDataPermissionQuery; +import org.nl.system.service.user.dto.UserDataPermissionDto; import java.util.List; import java.util.Set; @@ -56,5 +59,20 @@ public interface ISysDataPermissionService extends IService { * 获取数据权限下拉框 * @return */ - Object getDataPermissionOption(); + List getDataPermissionOption(); + + List getDataShow(String id); + + /** + * 保存数据权限 + * @param datas + */ + void savePermission(JSONObject datas); + + /** + * 数据展示 + * @param data + * @return + */ + List getDataDetail(JSONObject data); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dao/SysDataScope.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dao/SysDataScope.java new file mode 100644 index 0000000..4b318b4 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dao/SysDataScope.java @@ -0,0 +1,44 @@ +package org.nl.system.service.permission.dao; + +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * 数据权限规则表 + *

+ * + * @author generator + * @since 2022-12-27 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("sys_data_scope") +public class SysDataScope implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 当前用户 + */ + private String selfUserId; + + /** + * 数据权限类型 + */ + private String permissionScopeType; + + /** + * 部门权限列表 + */ + private String deptId; + + /** + * 用户权限列表 + */ + private String userId; + + +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dao/mapper/SysDataPermissionMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dao/mapper/SysDataPermissionMapper.java index 9a57f5a..0312e64 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dao/mapper/SysDataPermissionMapper.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dao/mapper/SysDataPermissionMapper.java @@ -1,7 +1,11 @@ package org.nl.system.service.permission.dao.mapper; +import org.apache.ibatis.annotations.Param; import org.nl.system.service.permission.dao.SysDataPermission; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.nl.system.service.permission.dao.SysDataScope; + +import java.util.List; /** *

@@ -13,4 +17,15 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface SysDataPermissionMapper extends BaseMapper { + List findDataScopeUserIdBySelfUserIdAndScopeType(String userId, String permissionScopeType); + + List findDataScopeDeptIdBySelfUserIdAndScopeType(String userId, String permissionScopeType); + + void deleteScopeBySelfUserId(String userId); + + void insertDataScope(@Param("dataScope") SysDataScope dataScope); + + void insertDataScopes(@Param("dataScope") SysDataScope dataScope); + + List getDataDetail(String selfUserId, String permissionScopeType); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dao/mapper/SysDataPermissionMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dao/mapper/SysDataPermissionMapper.xml index 7f290ce..15d24e2 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dao/mapper/SysDataPermissionMapper.xml +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dao/mapper/SysDataPermissionMapper.xml @@ -1,5 +1,61 @@ + + INSERT INTO sys_data_scope(self_user_id, permission_scope_type, user_id) + VALUES (#{dataScope.selfUserId}, #{dataScope.permissionScopeType}, #{dataScope.userId}) + + + INSERT INTO sys_data_scope(self_user_id, permission_scope_type, user_id, dept_id) + VALUES (#{dataScope.selfUserId}, #{dataScope.permissionScopeType}, #{dataScope.userId}, #{dataScope.deptId}) + + + DELETE FROM sys_data_scope WHERE self_user_id = #{userId} + + + + diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dto/DataScopeEnum.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dto/DataScopeEnum.java new file mode 100644 index 0000000..9cd2300 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dto/DataScopeEnum.java @@ -0,0 +1,20 @@ +package org.nl.system.service.permission.dto; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * @Author: lyd + * @Description: + * @Date: 2022/12/27 + */ +@Getter +@AllArgsConstructor +public enum DataScopeEnum { + + USER("user", "用户数据权限"), + DEPT("dept", "部门数据权限"), + SELF("self", "自身数据权限"); + private final String code; + private final String name; +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/impl/SysDataPermissionServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/impl/SysDataPermissionServiceImpl.java index 4817fba..4674131 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/impl/SysDataPermissionServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/impl/SysDataPermissionServiceImpl.java @@ -3,18 +3,23 @@ package org.nl.system.service.permission.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.RequiredArgsConstructor; import org.nl.common.domain.query.PageQuery; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.common.utils.SecurityUtils; +import org.nl.modules.wql.WQL; import org.nl.system.service.dict.dao.Dict; import org.nl.system.service.dict.dao.mapper.SysDictMapper; import org.nl.system.service.permission.dao.SysDataPermission; +import org.nl.system.service.permission.dao.SysDataScope; import org.nl.system.service.permission.dao.mapper.SysDataPermissionMapper; import org.nl.system.service.permission.ISysDataPermissionService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.nl.system.service.permission.dto.DataScopeEnum; import org.nl.system.service.permission.dto.SysDataPermissionQuery; import org.nl.system.service.user.ISysUserService; import org.nl.system.service.user.dto.UserDataPermissionDto; @@ -92,7 +97,82 @@ public class SysDataPermissionServiceImpl extends ServiceImpl getDataPermissionOption() { + return this.list(); + } + + @Override + public List getDataShow(String userId) { + List userDataPermissionDtoList = userService.getUserDataPermissionByUserId(userId); + userDataPermissionDtoList.forEach(userDataPermissionDto -> { + SysDataPermission sysDataPermission = dataPermissionMapper.selectOne(new LambdaQueryWrapper().eq(SysDataPermission::getPermissionId, userDataPermissionDto.getPermissionId())); + if (sysDataPermission.getCode().equals(DataScopeEnum.USER.getCode())) { // 用户权限 + List userIds = dataPermissionMapper.findDataScopeUserIdBySelfUserIdAndScopeType(userId, userDataPermissionDto.getPermissionScopeType()); + if (ObjectUtil.isNotEmpty(userIds)) userDataPermissionDto.setUsers(userIds); + } else if (sysDataPermission.getCode().equals(DataScopeEnum.DEPT.getCode())) { // 部门权限 + List deptIds = dataPermissionMapper.findDataScopeDeptIdBySelfUserIdAndScopeType(userId, userDataPermissionDto.getPermissionScopeType()); + if (ObjectUtil.isNotEmpty(deptIds)) userDataPermissionDto.setDepts(deptIds); + } else if (sysDataPermission.getCode().equals(DataScopeEnum.SELF.getCode())) { // 自身 + List userIds = dataPermissionMapper.findDataScopeUserIdBySelfUserIdAndScopeType(userId, userDataPermissionDto.getPermissionScopeType()); + if (ObjectUtil.isNotEmpty(userIds)) userDataPermissionDto.setUsers(userIds); + } + // 其他不做处理 + }); + return userDataPermissionDtoList; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void savePermission(JSONObject datas) { + String user_id = datas.getString("userId"); + JSONArray data = datas.getJSONArray("datas"); + if (ObjectUtil.isEmpty(user_id)) throw new BadRequestException("用户不能为空"); + // 删除用户绑定的数据 + userService.deleteDataPermissionById(user_id); + dataPermissionMapper.deleteScopeBySelfUserId(user_id); + for (int i = 0; i < data.size(); i++) { + JSONObject scopeObj = data.getJSONObject(i); + String permission_scope_type = scopeObj.getString("value"); + String permission_id = scopeObj.getString("permissionId"); + UserDataPermissionDto userDataPermissionDto = new UserDataPermissionDto(); + userDataPermissionDto.setUserId(user_id); + userDataPermissionDto.setPermissionId(permission_id); + userDataPermissionDto.setPermissionScopeType(permission_scope_type); + // 保存用户数据权限 + userService.insertDataPermission(userDataPermissionDto); + JSONArray users = scopeObj.getJSONArray("users"); + if (ObjectUtil.isNotEmpty(users)) { // 如果是用户直接将用户的id绑定进去 + for (int j = 0; j < users.size(); j++) { + JSONObject user = users.getJSONObject(j); + String userId = user.getString("userId"); + SysDataScope dataScope = new SysDataScope(); + dataScope.setUserId(userId); + dataScope.setSelfUserId(user_id); + dataScope.setPermissionScopeType(permission_scope_type); + dataPermissionMapper.insertDataScope(dataScope); + } + } + JSONArray depts = scopeObj.getJSONArray("depts"); + if (ObjectUtil.isNotEmpty(depts)) { // 如果是部门，先根据部门id求出所有的用户id + for (int j = 0; j < depts.size(); j++) { + JSONObject dept = depts.getJSONObject(j); + String deptId = dept.getString("deptId"); + List user_ids = userService.getUserIdByDeptId(deptId); + user_ids.forEach(id -> { + SysDataScope dataScope = new SysDataScope(); + dataScope.setUserId(id); + dataScope.setDeptId(deptId); + dataScope.setSelfUserId(user_id); + dataScope.setPermissionScopeType(permission_scope_type); + dataPermissionMapper.insertDataScopes(dataScope); + }); + } + } + } + } + + @Override + public List getDataDetail(JSONObject data) { + return dataPermissionMapper.getDataDetail(data.getString("userId"), data.getString("permissionScopeType")); } } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/ISysUserService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/ISysUserService.java index 9940ca8..d58d747 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/ISysUserService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/ISysUserService.java @@ -31,4 +31,11 @@ public interface ISysUserService extends IService { void update(Map userDetail); List getUserDataPermissionByPermissionId(String permissionId); + List getUserDataPermissionByUserId(String userId); + + void deleteDataPermissionById(String userId); + + void insertDataPermission(UserDataPermissionDto userDataPermissionDto); + + List getUserIdByDeptId(String deptId); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.java index 419570b..032de9e 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.java @@ -27,4 +27,12 @@ public interface SysUserMapper extends BaseMapper { List> getDetailForMap(@Param("query") UserQuery query, @Param("page")PageQuery page); List getUserDataPermissionByPermissionId(String permissionId); + + List getUserDataPermissionByUserId(String userId); + + void deleteDataPermissionById(String userId); + + void insertDataPermission(@Param("dataPermission") UserDataPermissionDto dataPermission); + + List getUserIdByDeptId(String deptId); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml index 46212a6..7c9e8a9 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml @@ -24,6 +24,12 @@ sys_user.extperson_id as extpersonId, sys_user.extuser_id as extuserId + + INSERT INTO sys_user_data_permission(user_id, permission_scope_type, permission_id) VALUES (#{dataPermission.userId}, #{dataPermission.permissionScopeType}, #{dataPermission.permissionId}) + + + DELETE FROM sys_user_data_permission WHERE user_id = #{userId} + @@ -119,4 +125,19 @@ resultType="org.nl.system.service.user.dto.UserDataPermissionDto"> SELECT * FROM sys_user_data_permission WHERE permission_id = #{permissionId} + + diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dto/UserDataPermissionDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dto/UserDataPermissionDto.java index 2be975f..8414405 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dto/UserDataPermissionDto.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dto/UserDataPermissionDto.java @@ -1,6 +1,12 @@ package org.nl.system.service.user.dto; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.util.List; /** * @Author: lyd @@ -8,10 +14,18 @@ import lombok.Data; * @Date: 2022/12/20 */ @Data -public class UserDataPermissionDto { +@EqualsAndHashCode(callSuper = false) +@TableName("sys_user_data_permission") +public class UserDataPermissionDto implements Serializable { private String userId; private String permissionScopeType; private String permissionId; + + @TableField(exist = false) + private List users; + + @TableField(exist = false) + private List depts; } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java index 1f9eefc..547baa0 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java @@ -150,4 +150,24 @@ public class ISysUserServiceImpl extends ServiceImpl imp public List getUserDataPermissionByPermissionId(String permissionId) { return sysUserMapper.getUserDataPermissionByPermissionId(permissionId); } + + @Override + public List getUserDataPermissionByUserId(String userId) { + return sysUserMapper.getUserDataPermissionByUserId(userId); + } + + @Override + public void deleteDataPermissionById(String userId) { + sysUserMapper.deleteDataPermissionById(userId); + } + + @Override + public void insertDataPermission(UserDataPermissionDto userDataPermissionDto) { + sysUserMapper.insertDataPermission(userDataPermissionDto); + } + + @Override + public List getUserIdByDeptId(String deptId) { + return sysUserMapper.getUserIdByDeptId(deptId); + } } diff --git a/nladmin-ui/src/views/loki/view/index.vue b/nladmin-ui/src/views/loki/view/index.vue index 66b7284..054cd61 100644 --- a/nladmin-ui/src/views/loki/view/index.vue +++ b/nladmin-ui/src/views/loki/view/index.vue @@ -32,7 +32,6 @@ end-placeholder="结束日期" align="right" @change="queryData" - @blur="queryData" /> diff --git a/nladmin-ui/src/views/system/user/dialog/relevanceDeptDialog.vue b/nladmin-ui/src/views/system/user/dialog/relevanceDeptDialog.vue index c848ca1..8ece6df 100644 --- a/nladmin-ui/src/views/system/user/dialog/relevanceDeptDialog.vue +++ b/nladmin-ui/src/views/system/user/dialog/relevanceDeptDialog.vue @@ -53,8 +53,8 @@ - - + + @@ -76,7 +76,7 @@ export default { name: 'RelevanceDeptDialog', components: { rrOperation, pagination }, cruds() { - return CRUD({ title: '部门', idField: 'dept_id', url: 'api/dept/vo', crudMethod: { ...crudDept }, query: { is_used: '1' }}) + return CRUD({ title: '部门', idField: 'deptId', url: 'api/dept/vo', crudMethod: { ...crudDept }, query: { isUsed: '1' }}) }, mixins: [presenter(), header()], dicts: ['product_series'], @@ -119,7 +119,7 @@ export default { this.$nextTick(function() { for (var k = 0; k < this.depts.length; k++) { for (var i = 0; i < this.crud.data.length; i++) { - if (this.crud.data[i].dept_id == this.depts[k].dept_id) { + if (this.crud.data[i].deptId == this.depts[k].deptId) { this.$refs.table.toggleRowSelection(this.crud.data[i], true) break } @@ -160,7 +160,7 @@ export default { // console.log(this.rows) }, getDeptDatas(tree, treeNode, resolve) { - const params = { pid: tree.dept_id } + const params = { pid: tree.deptId } setTimeout(() => { crudDept.getDeptvo(params).then(res => { resolve(res.content) diff --git a/nladmin-ui/src/views/system/user/dialog/relevanceUserDialog.vue b/nladmin-ui/src/views/system/user/dialog/relevanceUserDialog.vue index 77c205e..bfb4a58 100644 --- a/nladmin-ui/src/views/system/user/dialog/relevanceUserDialog.vue +++ b/nladmin-ui/src/views/system/user/dialog/relevanceUserDialog.vue @@ -47,14 +47,14 @@ @@ -78,7 +78,7 @@ export default { name: 'RelevanceUserDialog', components: { rrOperation, pagination }, cruds() { - return CRUD({ title: '用户', idField: 'user_id', url: 'api/users', crudMethod: { ...crudUser }, query: {is_used: '1'}}) + return CRUD({ title: '用户', idField: 'userId', url: 'api/users', crudMethod: { ...crudUser }, query: {isUsed: '1'}}) }, mixins: [presenter(), header()], dicts: ['product_series'], @@ -118,9 +118,10 @@ export default { }, open() { this.$nextTick(function() { + console.log(this.crud.data) for (var k = 0; k < this.users.length; k++) { for (var i = 0; i < this.crud.data.length; i++) { - if (this.crud.data[i].user_id == this.users[k].user_id) { + if (this.crud.data[i].userId == this.users[k].userId) { this.$refs.table.toggleRowSelection(this.crud.data[i], true) break } diff --git a/nladmin-ui/src/views/system/user/dialog/showDataPermissionDialog.vue b/nladmin-ui/src/views/system/user/dialog/showDataPermissionDialog.vue index b2a63a0..8e98220 100644 --- a/nladmin-ui/src/views/system/user/dialog/showDataPermissionDialog.vue +++ b/nladmin-ui/src/views/system/user/dialog/showDataPermissionDialog.vue @@ -42,7 +42,7 @@ export default { name: 'ShowDataPermissionDialog', components: { rrOperation, pagination }, cruds() { - return CRUD({ title: '权限明细', idField: 'user_id', url: 'api/dataPermission/dataDetail'}) + return CRUD({ title: '权限明细', idField: 'userId', url: 'api/dataPermission/dataDetail'}) }, mixins: [presenter(), header()], dicts: ['product_series'], diff --git a/nladmin-ui/src/views/system/user/index.vue b/nladmin-ui/src/views/system/user/index.vue index 358b061..79ac43f 100644 --- a/nladmin-ui/src/views/system/user/index.vue +++ b/nladmin-ui/src/views/system/user/index.vue @@ -249,7 +249,7 @@ - + @@ -306,11 +306,11 @@ > - - + + @@ -393,7 +393,7 @@ export default { dataPerm: false, dataDialog: {}, permissions: [], - permission_id: '', + permissionId: '', multipleSelection: [], // 选中 relevanceUser: false, // 关联用户 rowData: {}, // 当行数据 @@ -686,19 +686,20 @@ export default { this.dataDialog.dataScopeType = res // permissions crudDataPermission.getDataPermissionOption().then(res => { + // console.log(res) this.permissions = res this.dataDialog.personName = row.personName this.dataDialog.username = row.username - this.dataDialog.user_id = row.user_id + this.dataDialog.userId = row.userId this.dataPermissionTitle = '[' + row.personName + '] 数据权限' this.dataPerm = true // 回显数据 - crudDataPermission.getDataShow(row.user_id).then(res => { + crudDataPermission.getDataShow(row.userId).then(res => { this.$nextTick(function() { for (var index = 0; index < res.length; index++) { for (var i = 0; i < this.dataDialog.dataScopeType.length; i++) { - if (this.dataDialog.dataScopeType[i].value == res[index].permission_scope_type) { - this.dataDialog.dataScopeType[i].permission_id = res[index].permission_id + if (this.dataDialog.dataScopeType[i].value == res[index].permissionScopeType) { + this.dataDialog.dataScopeType[i].permissionId = res[index].permissionId if (res[index].users) this.dataDialog.dataScopeType[i].users = res[index].users if (res[index].depts) this.dataDialog.dataScopeType[i].depts = res[index].depts // 选中 @@ -717,25 +718,26 @@ export default { }, openRelevance(row, index) { for (var i = 0; i < this.permissions.length; i++) { - if (this.permissions[i].permission_id != undefined && this.permissions[i].permission_id && this.permissions[i].permission_id != row.permission_id) { - this.$delete(this.dataDialog.dataScopeType[index], this.permissions[i].permission_id.toString()) + if (this.permissions[i].permissionId != undefined && this.permissions[i].permissionId && this.permissions[i].permissionId != row.permissionId) { + this.$delete(this.dataDialog.dataScopeType[index], this.permissions[i].permissionId.toString()) } } - this.$set(this.dataDialog.dataScopeType[index], this.dataDialog.dataScopeType[index].permission_id, row.permission_id) + this.$set(this.dataDialog.dataScopeType[index], this.dataDialog.dataScopeType[index].permissionId, row.permissionId) this.rowData = {} this.deptIds = [] this.userIds = [] - if (row.permission_id == '1601040560293023744') { // 选择用户 + console.log(row) + if (row.permissionId == '1605129738328870912') { // 选择用户 this.userIds = this.dataDialog.dataScopeType[index].users this.rowData = row this.relevanceUser = true - } else if (row.permission_id == '1601040621190123520') { // 选择部门 + } else if (row.permissionId == '1605129882164137984') { // 选择部门 this.deptIds = this.dataDialog.dataScopeType[index].depts this.rowData = row this.relevanceDept = true - } else if (row.permission_id == '1601038030326599680') { // 自身 + } else if (row.permissionId == '1605128919449735168') { // 自身 const param = { - user_id: this.dataDialog.user_id + userId: this.dataDialog.userId } this.dataDialog.dataScopeType[index].users = [] this.dataDialog.dataScopeType[index].users.push(param) @@ -746,7 +748,7 @@ export default { }, selectUsers(row) { // row对话框传来的数据 for (var i = 0; i < this.dataDialog.dataScopeType.length; i++) { - if (this.dataDialog.dataScopeType[i].dict_id == this.rowData.dict_id) { + if (this.dataDialog.dataScopeType[i].dictId == this.rowData.dictId) { if (this.dataDialog.dataScopeType[i].depts != undefined && this.dataDialog.dataScopeType[i].depts.length > 0) this.dataDialog.dataScopeType[i].depts = [] this.dataDialog.dataScopeType[i].users = row break @@ -756,7 +758,7 @@ export default { }, selectDepts(row) { for (var i = 0; i < this.dataDialog.dataScopeType.length; i++) { - if (this.dataDialog.dataScopeType[i].dict_id == this.rowData.dict_id) { + if (this.dataDialog.dataScopeType[i].dictId == this.rowData.dictId) { if (this.dataDialog.dataScopeType[i].users != undefined && this.dataDialog.dataScopeType[i].users.length > 0) this.dataDialog.dataScopeType[i].users = [] this.dataDialog.dataScopeType[i].depts = row break @@ -769,9 +771,10 @@ export default { }, savePermise() { const param = { - user_id: this.dataDialog.user_id, + userId: this.dataDialog.userId, datas: this.multipleSelection } + console.log('param', param) crudDataPermission.saveDataPermission(param).then(res => { this.dataPerm = false this.crud.notify('添加数据权限成功', CRUD.NOTIFICATION_TYPE.SUCCESS) @@ -861,12 +864,12 @@ export default { }, showDatas(row) { const param = { - user_id: this.dataDialog.user_id, - permission_scope_type: row.value + userId: this.dataDialog.userId, + permissionScopeType: row.value } - // crudDataPermission.getDataDetail(param).then(res => { - // this.dataPermissions = res - // }) + crudDataPermission.getDataDetail(param).then(res => { + this.dataPermissions = res + }) this.showData = true } }