diff --git a/src/main/java/com/rebuild/core/configuration/general/FormsBuilder.java b/src/main/java/com/rebuild/core/configuration/general/FormsBuilder.java index 1099fe9a9..13f549b4c 100644 --- a/src/main/java/com/rebuild/core/configuration/general/FormsBuilder.java +++ b/src/main/java/com/rebuild/core/configuration/general/FormsBuilder.java @@ -34,6 +34,7 @@ import com.rebuild.core.support.i18n.Language; import com.rebuild.core.support.state.StateManager; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.BooleanUtils; import org.springframework.util.Assert; import java.util.*; @@ -481,7 +482,7 @@ public class FormsBuilder extends FormsManager { private boolean isUseDesensitized(EasyField field, ID user) { if (user == null) return false; - return "true".equals(field.getExtraAttr(EasyFieldConfigProps.ADV_DESENSITIZED)) + return BooleanUtils.toBoolean(field.getExtraAttr(EasyFieldConfigProps.ADV_DESENSITIZED)) && !Application.getPrivilegesManager().allow(user, ZeroEntry.AllowNoDesensitized); } diff --git a/src/main/java/com/rebuild/core/support/general/DataListWrapper.java b/src/main/java/com/rebuild/core/support/general/DataListWrapper.java index 761d74a50..9a9220d86 100644 --- a/src/main/java/com/rebuild/core/support/general/DataListWrapper.java +++ b/src/main/java/com/rebuild/core/support/general/DataListWrapper.java @@ -22,6 +22,7 @@ import com.rebuild.core.privileges.UserHelper; import com.rebuild.core.privileges.bizz.ZeroEntry; import com.rebuild.utils.JSONUtils; import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.BooleanUtils; import java.util.Map; @@ -162,7 +163,7 @@ public class DataListWrapper { private boolean isUseDesensitized(EasyField easyField) { return this.useDesensitized - && "true".equals(easyField.getExtraAttr(EasyFieldConfigProps.ADV_DESENSITIZED)); + && BooleanUtils.toBoolean(easyField.getExtraAttr(EasyFieldConfigProps.ADV_DESENSITIZED)); } /** diff --git a/src/main/resources/web/admin/bizuser/role-privileges.html b/src/main/resources/web/admin/bizuser/role-privileges.html index b32531e4a..90df514c6 100644 --- a/src/main/resources/web/admin/bizuser/role-privileges.html +++ b/src/main/resources/web/admin/bizuser/role-privileges.html @@ -226,7 +226,10 @@