Commit cbdc3806 authored by hongguangwu's avatar hongguangwu

MVP1.7.15-税友户配置拦截权限2

parent 5eee04ac
...@@ -185,7 +185,8 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap ...@@ -185,7 +185,8 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
if (CommonConstants.ONE_STRING.equals(type)) { if (CommonConstants.ONE_STRING.equals(type)) {
typeName = "公积金"; typeName = "公积金";
} }
String auditNo = "审核人("+auditUserName+")账号没有派单审核角色,不能授权为审核人,"; String auditNoPrf = "审核人("+auditUserName+")账号";
String auditNo = auditNoPrf + "没有派单审核角色,";
List<String> userIdList = new ArrayList<>(); List<String> userIdList = new ArrayList<>();
String menuId; String menuId;
...@@ -208,8 +209,11 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap ...@@ -208,8 +209,11 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
returnStr = auditNo; returnStr = auditNo;
} }
auditNo = "审核人("+auditUserName+")账号没有派单审核用户组权限,不能授权为审核人,"; if (Common.isEmpty(returnStr)) {
auditNo = auditNoPrf + "没有派单审核用户组权限,";
} else {
auditNo = "没有派单审核用户组权限,";
}
// 【数据权限】的【派单审核】菜单 // 【数据权限】的【派单审核】菜单
menuId = "1549677464986763265"; menuId = "1549677464986763265";
...@@ -225,11 +229,16 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap ...@@ -225,11 +229,16 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
} else { } else {
returnStr += auditNo; returnStr += auditNo;
} }
if (Common.isNotNull(returnStr)) {
returnStr += "不能授权为审核人。";
}
} }
String returnStrHandle = "";
// 2办理人 // 2办理人
if (Common.isNotNull(handleUser)) { if (Common.isNotNull(handleUser)) {
String handleNo = "办理人(" + handleUserName + ")账号没有" + typeName + "的办理角色,不能授权为办理人,"; String handleNoPrf = "办理人(" + handleUserName + ")账号";
String handleNo = handleNoPrf + "没有" + typeName + "的办理角色,";
// 1:角色菜单 // 1:角色菜单
// 社保、公积金办理,换成用办理人查询: // 社保、公积金办理,换成用办理人查询:
...@@ -245,10 +254,10 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap ...@@ -245,10 +254,10 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
if (returnVoR != null && returnVoR.getData() != null && returnVoR.getData().getKeyValueMap() != null && !returnVoR.getData().getKeyValueMap().isEmpty()) { if (returnVoR != null && returnVoR.getData() != null && returnVoR.getData().getKeyValueMap() != null && !returnVoR.getData().getKeyValueMap().isEmpty()) {
valueStr = returnVoR.getData().getKeyValueMap().get(handleUser); valueStr = returnVoR.getData().getKeyValueMap().get(handleUser);
if (Common.isEmpty(valueStr) || CommonConstants.ZERO_STRING.equals(valueStr)) { if (Common.isEmpty(valueStr) || CommonConstants.ZERO_STRING.equals(valueStr)) {
returnStr += handleNo; returnStrHandle += handleNo;
} }
} else { } else {
returnStr += handleNo; returnStrHandle += handleNo;
} }
} }
// 公积金办理 // 公积金办理
...@@ -261,14 +270,18 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap ...@@ -261,14 +270,18 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
if (returnVoR != null && returnVoR.getData() != null && returnVoR.getData().getKeyValueMap() != null && !returnVoR.getData().getKeyValueMap().isEmpty()) { if (returnVoR != null && returnVoR.getData() != null && returnVoR.getData().getKeyValueMap() != null && !returnVoR.getData().getKeyValueMap().isEmpty()) {
valueStr = returnVoR.getData().getKeyValueMap().get(handleUser); valueStr = returnVoR.getData().getKeyValueMap().get(handleUser);
if (Common.isEmpty(valueStr) || CommonConstants.ZERO_STRING.equals(valueStr)) { if (Common.isEmpty(valueStr) || CommonConstants.ZERO_STRING.equals(valueStr)) {
returnStr += handleNo; returnStrHandle += handleNo;
} }
} else { } else {
returnStr += handleNo; returnStrHandle += handleNo;
} }
} }
handleNo = "办理人(" + handleUserName + ")账号没有" + typeName + "的用户组权限,不能授权为办理人,"; if (Common.isEmpty(returnStrHandle)) {
handleNo = handleNoPrf + "没有" + typeName + "的用户组权限,";
} else {
handleNo = "没有" + typeName + "的用户组权限,";
}
// 社保、公积金办理,换成用办理人查询: // 社保、公积金办理,换成用办理人查询:
userIdList = new ArrayList<>(); userIdList = new ArrayList<>();
...@@ -283,10 +296,10 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap ...@@ -283,10 +296,10 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
if (returnVoR != null && returnVoR.getData() != null && returnVoR.getData().getKeyValueMap() != null && !returnVoR.getData().getKeyValueMap().isEmpty()) { if (returnVoR != null && returnVoR.getData() != null && returnVoR.getData().getKeyValueMap() != null && !returnVoR.getData().getKeyValueMap().isEmpty()) {
valueStr = returnVoR.getData().getKeyValueMap().get(handleUser); valueStr = returnVoR.getData().getKeyValueMap().get(handleUser);
if (Common.isEmpty(valueStr) || CommonConstants.ZERO_STRING.equals(valueStr)) { if (Common.isEmpty(valueStr) || CommonConstants.ZERO_STRING.equals(valueStr)) {
returnStr += handleNo; returnStrHandle += handleNo;
} }
} else { } else {
returnStr += handleNo; returnStrHandle += handleNo;
} }
} }
// 公积金办理 // 公积金办理
...@@ -299,16 +312,20 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap ...@@ -299,16 +312,20 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
if (returnVoR != null && returnVoR.getData() != null && returnVoR.getData().getKeyValueMap() != null && !returnVoR.getData().getKeyValueMap().isEmpty()) { if (returnVoR != null && returnVoR.getData() != null && returnVoR.getData().getKeyValueMap() != null && !returnVoR.getData().getKeyValueMap().isEmpty()) {
valueStr = returnVoR.getData().getKeyValueMap().get(handleUser); valueStr = returnVoR.getData().getKeyValueMap().get(handleUser);
if (Common.isEmpty(valueStr) || CommonConstants.ZERO_STRING.equals(valueStr)) { if (Common.isEmpty(valueStr) || CommonConstants.ZERO_STRING.equals(valueStr)) {
returnStr += handleNo; returnStrHandle += handleNo;
} }
} else { } else {
returnStr += handleNo; returnStrHandle += handleNo;
} }
} }
if (Common.isNotNull(returnStrHandle)) {
returnStrHandle += "不能授权为办理人。";
}
} }
if (Common.isNotNull(returnStr)) { if (Common.isNotNull(returnStr) || Common.isNotNull(returnStrHandle)) {
returnStr += "请找管理员协助补足权限后重新授权。"; returnStr += returnStrHandle + "请找管理员协助补足权限后重新授权。";
} }
return returnStr; return returnStr;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment