diff --git a/fuintAdmin_zt/src/views/system/role/index.vue b/fuintAdmin_zt/src/views/system/role/index.vue
index 7de894c4d..2cb70f947 100644
--- a/fuintAdmin_zt/src/views/system/role/index.vue
+++ b/fuintAdmin_zt/src/views/system/role/index.vue
@@ -70,7 +70,11 @@
+
+ {{scope.row.status=='A'?'启用':'禁用'}}
+
-
+
-
-
+
+
-
+
启用
禁用
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/common/enums/AdminRoleEnum.java b/fuintBackend/fuint-application/src/main/java/com/fuint/common/enums/AdminRoleEnum.java
index 4351d59c7..48b684f7f 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/common/enums/AdminRoleEnum.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/common/enums/AdminRoleEnum.java
@@ -9,7 +9,8 @@ package com.fuint.common.enums;
public enum AdminRoleEnum {
ADMIN("1", "超级管理员","admin"),
COMMON("2", "普通管理员","common"),
- USER("3", "用户角色","user");
+ USER("3", "用户角色","user"),
+ STAFF("4", "员工角色","staff");
private String key;
private String name;
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/SourceService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/SourceService.java
index 80b80845a..610b9ff2a 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/SourceService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/SourceService.java
@@ -23,6 +23,13 @@ public interface SourceService extends IService {
*/
List getAvailableSources(Integer merchantId);
+ /**
+ * 获取有效的菜单集合
+ *
+ * @return
+ */
+ List getAvailableSources1(Integer merchantId);
+
/**
* 获取菜单的属性结构
*
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/SourceServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/SourceServiceImpl.java
index a54e323d2..50391d08c 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/SourceServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/SourceServiceImpl.java
@@ -2,8 +2,10 @@ package com.fuint.common.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.fuint.common.domain.TreeSelect;
+import com.fuint.common.dto.AccountInfo;
import com.fuint.common.enums.StatusEnum;
import com.fuint.common.service.SourceService;
+import com.fuint.common.util.TokenUtil;
import com.fuint.common.vo.MetaVo;
import com.fuint.common.vo.RouterVo;
import com.fuint.framework.annoation.OperationServiceLog;
@@ -42,6 +44,11 @@ public class SourceServiceImpl extends ServiceImpl imple
return tSourceMapper.findByStatus(merchantId, StatusEnum.ENABLED.getKey());
}
+ @Override
+ public List getAvailableSources1(Integer merchantId) {
+ return tSourceMapper.findByStatus1(merchantId, StatusEnum.ENABLED.getKey());
+ }
+
/**
* 获取菜单的属性结构
*
@@ -49,7 +56,9 @@ public class SourceServiceImpl extends ServiceImpl imple
*/
@Override
public List getSourceTree(Integer merchantId) {
+ AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
List tSources = getAvailableSources(merchantId);
+ if (nowAccountInfo.getRoleIds().equals("14")) tSources = getAvailableSources1(1);
List trees = new ArrayList<>();
if (tSources != null && tSources.size() > 0) {
TreeNode sourceTreeNode = null;
@@ -100,7 +109,7 @@ public class SourceServiceImpl extends ServiceImpl imple
@Override
public List getMenuListByUserId(Integer merchantId, Integer accountId) {
if (merchantId == null) {
- merchantId = 0;
+ merchantId = 1;
}
List sourceList = tSourceMapper.findSourcesByAccountId(merchantId, accountId);
return delRepeated(sourceList);
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/system/role/controller/BackendDutyController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/system/role/controller/BackendDutyController.java
index aeef00c57..1a65deb25 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/system/role/controller/BackendDutyController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/system/role/controller/BackendDutyController.java
@@ -86,6 +86,7 @@ public class BackendDutyController extends BaseController {
}
paginationRequest.setSearchParams(searchParams);
+ paginationRequest.setRoleIds(accountInfo.getRoleIds());
PaginationResponse paginationResponse = tDutyService.findDutiesByPagination(paginationRequest);
List content = new ArrayList<>();
if (paginationResponse.getContent().size() > 0) {
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/system/role/service/impl/DutyServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/system/role/service/impl/DutyServiceImpl.java
index 098e6d1fd..3dc3bd8bf 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/system/role/service/impl/DutyServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/system/role/service/impl/DutyServiceImpl.java
@@ -252,7 +252,17 @@ public class DutyServiceImpl extends ServiceImpl implements
}
lambdaQueryWrapper.orderByDesc(TDuty::getDutyId);
- List dataList = tDutyMapper.selectList(lambdaQueryWrapper);
+ List dataList1 = tDutyMapper.selectList(lambdaQueryWrapper);
+ List dataList = new ArrayList<>();
+ if (paginationRequest.getRoleIds().equals("14")){
+ for (TDuty tDuty : dataList1) {
+ if (tDuty.getDutyId()==12) dataList.add(tDuty);
+ if (tDuty.getDutyId()==15) dataList.add(tDuty);
+ if (tDuty.getDutyId()==16) dataList.add(tDuty);
+ }
+ }else {
+ dataList = dataList1;
+ }
PageRequest pageRequest = PageRequest.of(paginationRequest.getCurrentPage(), paginationRequest.getPageSize());
PageImpl pageImpl = new PageImpl(dataList, pageRequest, pageHelper.getTotal());
diff --git a/fuintBackend/fuint-framework/src/main/java/com/fuint/framework/pagination/PaginationRequest.java b/fuintBackend/fuint-framework/src/main/java/com/fuint/framework/pagination/PaginationRequest.java
index 65161724a..a01996266 100644
--- a/fuintBackend/fuint-framework/src/main/java/com/fuint/framework/pagination/PaginationRequest.java
+++ b/fuintBackend/fuint-framework/src/main/java/com/fuint/framework/pagination/PaginationRequest.java
@@ -1,5 +1,7 @@
package com.fuint.framework.pagination;
+import lombok.Data;
+
import java.io.Serializable;
import java.util.Map;
@@ -9,6 +11,7 @@ import java.util.Map;
* Created by FSQ
* CopyRight https://www.fuint.cn
*/
+@Data
public class PaginationRequest implements Serializable {
/** */
@@ -33,6 +36,10 @@ public class PaginationRequest implements Serializable {
* 分页查询参数
*/
private Map searchParams;
+ /**
+ * 角色id
+ */
+ private String roleIds;
public int getCurrentPage() {
return currentPage;
diff --git a/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/mapper/TSourceMapper.java b/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/mapper/TSourceMapper.java
index 3216d8799..bcfdcf77c 100644
--- a/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/mapper/TSourceMapper.java
+++ b/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/mapper/TSourceMapper.java
@@ -19,4 +19,6 @@ public interface TSourceMapper extends BaseMapper {
List findByStatus(@Param("merchantId") Integer merchantId, @Param("status") String status);
+ List findByStatus1(@Param("merchantId") Integer merchantId, @Param("status") String status);
+
}
diff --git a/fuintBackend/fuint-repository/src/main/resources/mapper/TSourceMapper.xml b/fuintBackend/fuint-repository/src/main/resources/mapper/TSourceMapper.xml
index ad9969ca6..f6438c152 100644
--- a/fuintBackend/fuint-repository/src/main/resources/mapper/TSourceMapper.xml
+++ b/fuintBackend/fuint-repository/src/main/resources/mapper/TSourceMapper.xml
@@ -2,7 +2,15 @@
+