关联表单隐藏效果-角色权限

src/main/java/com/hxgk/lowcode/controller/AssociatedFormsController.java

@@ -171,7 +171,25 @@ 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<String,String> 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);
 

src/main/java/com/hxgk/lowcode/service/CustomerFormService.java

@@ -19,5 +19,7 @@ public interface CustomerFormService {
     ArrayList<CustomerFormTableSingleFieldValue> getAsfDataTitles(String formId, String dataTitle,String rangeFormula, String rangeString, String hideFormula, String hideString);
     ArrayList<CustomerFormTableSingleFieldValue> getAsfDataTitlesByIds(String AsfFormId,ArrayList<HashMap<String,String>> 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);
 }

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<String,String> 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<String,String> 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;
+        }
+
+    }
+
 
 }