diff --git a/ServiceSite/src/main/java/com/seasky/flowportal/service/impl/ExternalDataServiceDotNetImpl.java b/ServiceSite/src/main/java/com/seasky/flowportal/service/impl/ExternalDataServiceDotNetImpl.java index acff261956f1ab4cf2518d8de4bc106b381a16cd..81d623f8ade58d1bdf8be3fcb15d1dfc8ebd670c 100644 --- a/ServiceSite/src/main/java/com/seasky/flowportal/service/impl/ExternalDataServiceDotNetImpl.java +++ b/ServiceSite/src/main/java/com/seasky/flowportal/service/impl/ExternalDataServiceDotNetImpl.java @@ -76,7 +76,7 @@ public class ExternalDataServiceDotNetImpl extends ExternalDataServiceImpl imp instanceId = ObjectUtils.isNotEmpty(instanceId) ? instanceId : BaseInOutUtil.verifyInstanceId(); List<String> menuNameList = new ArrayList<>(); UserInfoOut userInfoByUserNo = getUserInfoByUserNo(instanceId, userNo); - List<RoleInfoOut> roleList = userInfoByUserNo.getRoleList().stream().filter(RoleInfoOut::getIsChecked).collect(Collectors.toList()); + List<RoleInfoOut> roleList = userInfoByUserNo.getRoleList().stream().filter(role -> Boolean.TRUE.equals(role.getIsEnable())).collect(Collectors.toList()); if (ObjectUtils.isNotEmpty(roleList)) { List<String> roleIDList = roleList.stream().map(RoleInfoOut::getRoleId).collect(Collectors.toList()); menuNameList = selectApplicationMenu(instanceId, roleIDList); diff --git a/ServiceSite/src/main/java/com/seasky/flowportal/service/impl/ExternalDataServiceJavaImpl.java b/ServiceSite/src/main/java/com/seasky/flowportal/service/impl/ExternalDataServiceJavaImpl.java index e15a65e25561c70fa5eda90f1de50347cadba25e..d8f9194b54a73e61a90f4a7df17661a890cf81c7 100644 --- a/ServiceSite/src/main/java/com/seasky/flowportal/service/impl/ExternalDataServiceJavaImpl.java +++ b/ServiceSite/src/main/java/com/seasky/flowportal/service/impl/ExternalDataServiceJavaImpl.java @@ -86,7 +86,7 @@ public class ExternalDataServiceJavaImpl extends ExternalDataServiceImpl imple .build(); Result<UserQuerySignalOut> result = iExternalController.queryThirdUser(qry); String interfaceUrl = "IExternalController.queryThirdUser"; - log.info(String.format("璇锋眰鎺ュ彛锛氳姹傚湴鍧€锛�%s,璇锋眰鍙傛暟锛�%s,鍝嶅簲缁撴灉锛�%s", interfaceUrl, JSON.toJSONString(qry), result)); + log.info(String.format("璇锋眰鎺ュ彛锛氳姹傚湴鍧€锛�%s,璇锋眰鍙傛暟锛�%s,鍝嶅簲缁撴灉锛�%s", interfaceUrl, JSON.toJSONString(qry), JSON.toJSONString(result))); boolean isSuccess = ResponseCode.SUCCESS.value().equals(result.getCode()); if (!isSuccess || ObjectUtils.isEmpty(result.getData())) throw ExceptionUtil.getException(null, "鐢ㄦ埛涓嶅瓨鍦�,宸ュ彿锛�" + userNo); @@ -164,7 +164,7 @@ public class ExternalDataServiceJavaImpl extends ExternalDataServiceImpl imple for (String roleId : roleIdList) { qry.setRoleId(ObjectUtils.isEmpty(roleId) ? null : Long.parseLong(roleId)); Result<UserQueryOut> result = iExternalController.queryThirdUserPage(qry); - log.info(String.format("璇锋眰鎺ュ彛锛氳姹傚湴鍧€锛�%s,璇锋眰鍙傛暟锛�%s,鍝嶅簲缁撴灉锛�%s", interfaceUrl, JSON.toJSONString(qry), result)); + log.info(String.format("璇锋眰鎺ュ彛锛氳姹傚湴鍧€锛�%s,璇锋眰鍙傛暟锛�%s,鍝嶅簲缁撴灉锛�%s", interfaceUrl, JSON.toJSONString(qry), JSON.toJSONString(result))); boolean isSuccess = ResponseCode.SUCCESS.value().equals(result.getCode()); if (!isSuccess || ObjectUtils.isEmpty(result.getData())) continue; @@ -187,7 +187,7 @@ public class ExternalDataServiceJavaImpl extends ExternalDataServiceImpl imple qry.setRecognizeId(roleInfoQuery.getRecognizeId()); Result<RoleOut> result = iExternalController.queryRoleListByRecognizeId(qry); String interfaceUrl = "IExternalController.queryRoleListByRecognizeId"; - log.info(String.format("璇锋眰鎺ュ彛锛氳姹傚湴鍧€锛�%s,璇锋眰鍙傛暟锛�%s,鍝嶅簲缁撴灉锛�%s", interfaceUrl, JSON.toJSONString(qry), result)); + log.info(String.format("璇锋眰鎺ュ彛锛氳姹傚湴鍧€锛�%s,璇锋眰鍙傛暟锛�%s,鍝嶅簲缁撴灉锛�%s", interfaceUrl, JSON.toJSONString(qry), JSON.toJSONString(result))); boolean isSuccess = ResponseCode.SUCCESS.value().equals(result.getCode()); if (!isSuccess || ObjectUtils.isEmpty(result.getData())) throw ExceptionUtil.getException(null,String.format("瑙掕壊涓嶅瓨鍦�,瑙掕壊鍚嶏細%s,搴旂敤璇嗗埆id锛�%s", roleInfoQuery.getRoleName(), roleInfoQuery.getRecognizeId())); @@ -230,7 +230,7 @@ public class ExternalDataServiceJavaImpl extends ExternalDataServiceImpl imple qry.setRecognizeId(recognizeId); Result<OrganizationQueryOut> result = iExternalController.queryOrganizationByRecognizeId(qry); String interfaceUrl = "IExternalController.queryOrganizationByRecognizeId"; - log.info(String.format("璇锋眰鎺ュ彛锛氳姹傚湴鍧€锛�%s,璇锋眰鍙傛暟锛�%s,鍝嶅簲缁撴灉锛�%s", interfaceUrl, JSON.toJSONString(qry), result)); + log.info(String.format("璇锋眰鎺ュ彛锛氳姹傚湴鍧€锛�%s,璇锋眰鍙傛暟锛�%s,鍝嶅簲缁撴灉锛�%s", interfaceUrl, JSON.toJSONString(qry), JSON.toJSONString(result))); boolean isSuccess = ResponseCode.SUCCESS.value().equals(result.getCode()); if (!isSuccess || ObjectUtils.isEmpty(result.getData())) throw ExceptionUtil.getException(null, "閮ㄩ棬涓嶅瓨鍦�,閮ㄩ棬缂栧彿锛�" + organizationCode); @@ -249,7 +249,7 @@ public class ExternalDataServiceJavaImpl extends ExternalDataServiceImpl imple .build(); Result<ApplicationOut> result = iExternalController.queryApplicationByRecognizeId(qry); String interfaceUrl = "IExternalController.queryApplicationByRecognizeId"; - log.info(String.format("璇锋眰鎺ュ彛锛氳姹傚湴鍧€锛�%s,璇锋眰鍙傛暟锛�%s,鍝嶅簲缁撴灉锛�%s", interfaceUrl, JSON.toJSONString(qry), result)); + log.info(String.format("璇锋眰鎺ュ彛锛氳姹傚湴鍧€锛�%s,璇锋眰鍙傛暟锛�%s,鍝嶅簲缁撴灉锛�%s", interfaceUrl, JSON.toJSONString(qry), JSON.toJSONString(result))); boolean isSuccess = ResponseCode.SUCCESS.value().equals(result.getCode()); if (!isSuccess || ObjectUtils.isEmpty(result.getData())) throw ExceptionUtil.getException(null, "搴旂敤涓嶅瓨鍦�,搴旂敤璇嗗埆id锛�" + recognizeId); @@ -434,7 +434,7 @@ public class ExternalDataServiceJavaImpl extends ExternalDataServiceImpl imple Result<com.seasky.micro.portal.dto.signature.SignatureOut> result = iUserController.querySignature(qry); String interfaceUrl = "IUserController.querySignature"; - log.info(String.format("璇锋眰鎺ュ彛锛氳姹傚湴鍧€锛�%s,璇锋眰鍙傛暟锛�%s,鍝嶅簲缁撴灉锛�%s", interfaceUrl, JSON.toJSONString(qry), result)); + log.info(String.format("璇锋眰鎺ュ彛锛氳姹傚湴鍧€锛�%s,璇锋眰鍙傛暟锛�%s,鍝嶅簲缁撴灉锛�%s", interfaceUrl, JSON.toJSONString(qry), JSON.toJSONString(result))); boolean isSuccess = ResponseCode.SUCCESS.value().equals(result.getCode()); if (!isSuccess || ObjectUtils.isEmpty(result.getData())) throw ExceptionUtil.getException(null, "鏈绱㈠埌淇℃伅,璇烽厤缃暟鎹�"); diff --git a/ServiceSite/src/main/java/com/seasky/flowportal/service/impl/LoginPortalServiceImpl.java b/ServiceSite/src/main/java/com/seasky/flowportal/service/impl/LoginPortalServiceImpl.java index 5dfc5f7b765bf7c3456081bb583f195fab166cc2..a3d5c602643af9d8e2b5d1c0d47be3d6e5512e79 100644 --- a/ServiceSite/src/main/java/com/seasky/flowportal/service/impl/LoginPortalServiceImpl.java +++ b/ServiceSite/src/main/java/com/seasky/flowportal/service/impl/LoginPortalServiceImpl.java @@ -184,7 +184,7 @@ public class LoginPortalServiceImpl implements LoginPortalService { @Override public List<RoleInfoOut> getLoginRoleList(Long instanceId, String userNo) { UserInfoOut userInfoByUserNo = ExternalDataUtil.INSTANCE.getUserInfoByUserNo(instanceId, userNo); - return userInfoByUserNo.getRoleList().stream().filter(RoleInfoOut::getIsChecked).collect(Collectors.toList()); + return userInfoByUserNo.getRoleList().stream().filter(role -> Boolean.TRUE.equals(role.getIsEnable())).collect(Collectors.toList()); } @Override diff --git a/ServiceSite/src/main/resources/website/seaskyflowportal.zip b/ServiceSite/src/main/resources/website/seaskyflowportal.zip index 9da9894a7daa1f76d31255d3ebbc3c5d19b6071d..3d5217cfd4c0a46b00439006f6b3abf0c6c5f799 100644 Binary files a/ServiceSite/src/main/resources/website/seaskyflowportal.zip and b/ServiceSite/src/main/resources/website/seaskyflowportal.zip differ