From f90aaaf5ce175b71672f6f4154f1c71b87c6c1e1 Mon Sep 17 00:00:00 2001 From: liwenxuan <1298531568@qq.com> Date: Fri, 2 Aug 2024 16:37:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E8=81=94=E8=A1=A8=E5=8D=95=E9=9A=90?= =?UTF-8?q?=E8=97=8F=E6=95=88=E6=9E=9C-=E8=A7=92=E8=89=B2=E6=9D=83?= =?UTF-8?q?=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AssociatedFormsController.java | 22 +++++++++++++++++-- .../lowcode/service/CustomerFormService.java | 4 +++- .../service/impl/CustomerFormServiceImpl.java | 20 ++++++++++++++++- 3 files changed, 42 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/hxgk/lowcode/controller/AssociatedFormsController.java b/src/main/java/com/hxgk/lowcode/controller/AssociatedFormsController.java index fe34bba..8a41bbf 100644 --- a/src/main/java/com/hxgk/lowcode/controller/AssociatedFormsController.java +++ b/src/main/java/com/hxgk/lowcode/controller/AssociatedFormsController.java @@ -171,8 +171,26 @@ public class AssociatedFormsController { String targetOrgOrPerson = requestBody.get("left"); String condition = requestBody.get("operator"); String currentUser = requestBody.get("right"); - Boolean flag = customerFormService.queryIfOrgOrPersonContainsCurrentUser(key,token,targetOrgOrPerson,condition,"当前用户"); - + Boolean flag = customerFormService.queryIfOrgOrPersonContainsCurrentUser(key,token,targetOrgOrPerson,condition,currentUser); + + return JsonData.buildSuccess(flag); + + } + + + + @RequestMapping(value = "AssociatedForms/queryHideRoleCondition") + public JsonData queryHideRoleCondition(@RequestHeader(value = "User-Key") String key, + @RequestHeader(value = "User-Token") String token, + @RequestBody Map requestBody) { + if(StringUtils.isBlank(key)||StringUtils.isBlank(token)){ + return JsonData.buildError("非法请求"); + } + String targetOrgOrPerson = requestBody.get("left"); + String condition = requestBody.get("operator"); + String currentUser = requestBody.get("right"); + Boolean flag = customerFormService.queryHideRoleCondition(key,token,targetOrgOrPerson,condition,currentUser); + return JsonData.buildSuccess(flag); } diff --git a/src/main/java/com/hxgk/lowcode/service/CustomerFormService.java b/src/main/java/com/hxgk/lowcode/service/CustomerFormService.java index c5cb1ee..2cb9a56 100644 --- a/src/main/java/com/hxgk/lowcode/service/CustomerFormService.java +++ b/src/main/java/com/hxgk/lowcode/service/CustomerFormService.java @@ -19,5 +19,7 @@ public interface CustomerFormService { ArrayList getAsfDataTitles(String formId, String dataTitle,String rangeFormula, String rangeString, String hideFormula, String hideString); ArrayList getAsfDataTitlesByIds(String AsfFormId,ArrayList> ids); - Boolean queryIfOrgOrPersonContainsCurrentUser(String key, String token, String targetOrgOrPerson, String condition, String 当前用户); + Boolean queryIfOrgOrPersonContainsCurrentUser(String key, String token, String targetOrgOrPerson, String condition, String currentUser); + + Boolean queryHideRoleCondition(String key, String token, String targetOrgOrPerson, String condition, String currentUser); } diff --git a/src/main/java/com/hxgk/lowcode/service/impl/CustomerFormServiceImpl.java b/src/main/java/com/hxgk/lowcode/service/impl/CustomerFormServiceImpl.java index 27ab145..459f44d 100644 --- a/src/main/java/com/hxgk/lowcode/service/impl/CustomerFormServiceImpl.java +++ b/src/main/java/com/hxgk/lowcode/service/impl/CustomerFormServiceImpl.java @@ -799,7 +799,7 @@ public class CustomerFormServiceImpl implements CustomerFormService { } @Override - public Boolean queryIfOrgOrPersonContainsCurrentUser(String key, String token, String targetOrgOrPerson, String condition, String 当前用户) { + public Boolean queryIfOrgOrPersonContainsCurrentUser(String key, String token, String targetOrgOrPerson, String condition, String currentUser) { //获取用户信息 从redis中根据userkey和usertoken拿到userdetail Map keytokenmap = new HashMap<>(); keytokenmap.put("userkey",key); @@ -842,5 +842,23 @@ public class CustomerFormServiceImpl implements CustomerFormService { } } + @Override + public Boolean queryHideRoleCondition(String key, String token, String targetOrgOrPerson, String condition, String currentUser) { + //获取用户信息 从redis中根据userkey和usertoken拿到userdetail + Map keytokenmap = new HashMap<>(); + keytokenmap.put("userkey",key); + keytokenmap.put("usertoken",token); + UserDetail userDetail = userService.getUserDetailFromRedis(keytokenmap); + + String[] targetOrgOrPersonArr = targetOrgOrPerson.split(":"); + String targetRoleId = targetOrgOrPersonArr[2]; + if(userDetail.getRoleId().toString().equals(targetRoleId)){ + return true; + }else{ + return false; + } + + } + }