From e59e6a8a2fcf3ac2194a69927cd5690453a83e91 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期三, 19 六月 2024 16:34:44 +0800
Subject: [PATCH] 投诉添加，云片短信添加
---
project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java
index 67468d3..bd34b92 100644
--- a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java
+++ b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java
@@ -53,20 +53,21 @@
public List<EnforceOrderVo> queryCheckList(EnforceOrderQueryBo bo)
{
SysUser loginUser = SecurityUtils.getLoginUser().getUser();
- if (!"01".equals(loginUser.getUserType())) {
- throw new BaseException("鎮ㄦ病鏈夊鎵规潈闄愶紝璇烽噸璇曪紒");
+ if (bo.getIsCheckQuery()!=null && bo.getIsCheckQuery()==1){
+ List<String> roleKeys = loginUser.getRoles().stream().map(SysRole::getRoleKey).collect(Collectors.toList());
+ if (roleKeys.contains(CheckLevelCodeConstants.CHECK_LEVEL_ONE) && roleKeys.contains(CheckLevelCodeConstants.CHECK_LEVEL_TWO)){
+ bo.setCheckLevel(null);
+ } else if (roleKeys.contains(CheckLevelCodeConstants.CHECK_LEVEL_ONE)){
+ bo.setCheckLevel(0);
+ } else if (roleKeys.contains(CheckLevelCodeConstants.CHECK_LEVEL_TWO)) {
+ bo.setCheckLevel(1);
+ } else {
+ throw new BaseException("鎮ㄦ病鏈夊鎵规潈闄愶紝璇烽噸璇曪紒");
+ }
}
- List<String> roleKeys = loginUser.getRoles().stream().map(SysRole::getRoleKey).collect(Collectors.toList());
- if (roleKeys.contains(CheckLevelCodeConstants.CHECK_LEVEL_ONE) && roleKeys.contains(CheckLevelCodeConstants.CHECK_LEVEL_TWO)){
- bo.setCheckLevel(null);
- } else if (roleKeys.contains(CheckLevelCodeConstants.CHECK_LEVEL_ONE)){
- bo.setCheckLevel(0);
- } else if (roleKeys.contains(CheckLevelCodeConstants.CHECK_LEVEL_TWO)) {
- bo.setCheckLevel(1);
- } else {
- throw new BaseException("鎮ㄦ病鏈夊鎵规潈闄愶紝璇烽噸璇曪紒");
- }
+
bo.setCheckDeptId(deptService.getCheckDeptIdByLoginDeptId(loginUser.getDeptId()));
+ bo.setApplyDeptIds(deptService.getApplyDeptIdsByLoginUserId(loginUser.getUserId()));
return this.baseMapper.selectCheckList(bo);
}
@@ -133,6 +134,7 @@
qw.eq(StringUtils.isNotEmpty(bo.getRegionCode()), "region_code", bo.getRegionCode());
qw.like(StringUtils.isNotEmpty(bo.getRegionName()), "region_name", bo.getRegionName());
qw.eq(StringUtils.isNotEmpty(bo.getEnforceReason()), "enforce_reason", bo.getEnforceReason());
+ qw.eq(StringUtils.isNotEmpty(bo.getEnforceType()), "enforce_type", bo.getEnforceType());
qw.eq(bo.getApplyId() != null, "apply_id", bo.getApplyId());
qw.eq(StringUtils.isNotEmpty(bo.getApplyUser()), "apply_user", bo.getApplyUser());
qw.eq(StringUtils.isNotEmpty(bo.getApplyPhone()), "apply_phone", bo.getApplyPhone());
--
Gitblit v1.9.1