1、报表模板支持物理删除;2、登录页登录手机号检查支持忽略admin;

This commit is contained in:
gaoqr
2024-12-10 15:25:18 +08:00
parent 1138c70ec9
commit 321c92040e
5 changed files with 26 additions and 2 deletions
@@ -7,6 +7,7 @@ import com.cf.imes.framework.organ.core.aop.OrganIgnore;
import com.cf.imes.module.report.controller.admin.template.vo.ReportTemplateSaveReqVO;
import com.cf.imes.module.report.dal.dataobject.template.ReportTemplateDO;
import com.cf.imes.module.report.enums.template.ReportTemplateTypeEnum;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -70,4 +71,13 @@ public interface ReportTemplateMapper extends BaseMapperX<ReportTemplateDO> {
* @return
*/
int selectExistTemplateName(@Param("reqVO") ReportTemplateSaveReqVO reqVO, @Param("isSuperAdmin") boolean isSuperAdmin, @Param("type") Integer type);
/**
* 根据id物理删除report_template
*
* @param id
* @return 改动数量
*/
@Delete("DELETE FROM report_template WHERE id = #{id}")
int physicalDeleteById(@Param("id") Long id);
}
@@ -212,7 +212,7 @@ public class ReportTemplateServiceImpl implements ReportTemplateService {
// 校验内置模板操作权限
validateSystemTemplate(reportTemplateDO);
// 删除
templateMapper.deleteById(id);
templateMapper.physicalDeleteById(id);
}