Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/revision/service/RevisionModelUtil.java

@@ -395,16 +395,15 @@
     */
    public boolean checkDataSecret(BaseModel baseModel) throws VciBaseException{
        VciBaseUtil.alertNotNull(baseModel,"要校验密级的数据对象");
        //todo 登录还未启用，所以密级无法获取需要修改
//        if(isCheckSecret(baseModel) && VciBaseUtil.getCurrentUserSecret()>0) {
//            if (baseModel.getSecretGrade() == null ) {
//                baseModel.setSecretGrade(DataSecretEnum.NONE.getValue());
//            }
//            Integer userSecret = VciBaseUtil.getCurrentUserSecret();
//            if (!checkUserSecret(baseModel.getSecretGrade())) {
//                throw new VciBaseException("当前用户的密级低于数据的密级，用户密级为" + UserSecretEnum.getSecretText(userSecret) + ",数据密级为" + DataSecretEnum.getSecretText(baseModel.getSecretGrade()));
//            }
//        }
        if(isCheckSecret(baseModel) && VciBaseUtil.getCurrentUserSecret()>0) {
            if (baseModel.getSecretGrade() == null ) {
                baseModel.setSecretGrade(DataSecretEnum.NONE.getValue());
            }
            Integer userSecret = VciBaseUtil.getCurrentUserSecret();
            if (!checkUserSecret(baseModel.getSecretGrade())) {
                throw new VciBaseException("当前用户的密级低于数据的密级，用户密级为" + UserSecretEnum.getSecretText(userSecret) + ",数据密级为" + DataSecretEnum.getSecretText(baseModel.getSecretGrade()));
            }
        }
        return true;
    }