center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
wangjiahao 2022-07-29 11:28:23 +08:00
commit d934726036
2 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/dataease/service/dataset/PermissionService.java
View File

@ -196,7 +196,7 @@ public class PermissionService {
List<DataSetColumnPermissionsDTO> deptColumnPermissionsDTOS = new ArrayList<>();
for (DataSetColumnPermissionsDTO columnPermissionsDTO : columnPermissionService.searchPermissions(dataSetColumnPermissionsDTO)) {
List<Long> userIdList = new Gson().fromJson(columnPermissionsDTO.getWhiteListUser(), new TypeToken<List<Long>>() {}.getType());
if(!userIdList.contains(userId)){
if(CollectionUtils.isNotEmpty(userIdList) && !userIdList.contains(userId)){
deptColumnPermissionsDTOS.add(columnPermissionsDTO);
}
}

35
frontend/src/styles/index.scss
View File

@ -934,11 +934,11 @@ div:focus {
.pagination-cont {
text-align: right;
margin-top: 10px;
::v-deep .el-pager li {
background-color: #fff;
border: 1px solid #bbbfc4;
border-radius: 4px;
color: #1f2329;
.el-pager li {
background-color: #fff !important;
border: 1px solid #bbbfc4 !important;
border-radius: 4px !important;
color: #1f2329 !important;
box-sizing: border-box;
line-height: 26px;
font-family: SF Pro Text;
@ -946,33 +946,32 @@ div:focus {
font-weight: 400;
}
::v-deep .btn-prev,
::v-deep .btn-next {
background: #fff;
background-color: #fff;
border: 1px solid #bbbfc4;
border-radius: 4px;
color: #bbbfc4;
.btn-prev,
.btn-next {
background-color: #fff !important;
border: 1px solid #bbbfc4 !important;
border-radius: 4px !important;
color: #bbbfc4 !important;
}
::v-deep .el-pagination__total {
.el-pagination__total {
font-family: "PingFang SC";
font-style: normal;
font-weight: 400;
font-size: 14px;
line-height: 22px;
color: #1f2329;
color: #1f2329 !important;
line-height: 28px;
}
::v-deep .number.active,
::v-deep .el-input__inner:hover {
border-color: #3370ff;
.number.active,
.el-input__inner:hover {
border-color: #3370ff !important;
color: #3370ff !important;
background-color: #fff !important;
}
::v-deep .el-icon-more {
.el-icon-more {
border: none !important;
}
}