diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheckDetail.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheckDetail.java index b7b37fde..e48b7a27 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheckDetail.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheckDetail.java @@ -225,6 +225,7 @@ public class ProcessStandardComplianceCheckDetail implements Serializable { @ApiModelProperty(value = "是否与上一版相同(字典:1:是,0:否)") @Excel(name = "是否与上一版相同", width = 15, dicCode = "yn") @Dict(dicCode = "yn") + @TableField(exist = false) private String isSameAsPrevVersion; /** diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java index 995202c5..d0b04562 100644 --- a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java @@ -51,9 +51,20 @@ public class LawsEvaluationNotMetLibraryServiceImpl extends ServiceImpl queryPage(LawsEvaluationNotMetLibrary lawsEvaluationNotMet, Integer pageNo, Integer pageSize, HttpServletRequest req) { + // TODO 权限 QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsEvaluationNotMet, req.getParameterMap()); queryWrapper.like(StringUtils.isNotBlank(lawsEvaluationNotMet.getStandardNumber()), "nm.standard_number", lawsEvaluationNotMet.getStandardNumber());