提交代码

master
rong.liu 2 years ago
parent 9a4264d707
commit 1f9bbe96bc
  1. 5
      src/main/java/com/huoran/iasf/controller/SysColumnController.java
  2. 8
      src/main/java/com/huoran/iasf/controller/SysContentController.java

@ -3,6 +3,8 @@ package com.huoran.iasf.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.huoran.iasf.common.aop.annotation.NoRepeatSubmit; import com.huoran.iasf.common.aop.annotation.NoRepeatSubmit;
import com.huoran.iasf.common.exception.NotFoundException;
import com.huoran.iasf.common.exception.code.BaseResponseCode;
import com.huoran.iasf.common.utils.Constant; import com.huoran.iasf.common.utils.Constant;
import com.huoran.iasf.entity.*; import com.huoran.iasf.entity.*;
import com.huoran.iasf.service.*; import com.huoran.iasf.service.*;
@ -75,6 +77,9 @@ public class SysColumnController {
@ApiOperation(value = "查询详情", response = SysColumn.class) @ApiOperation(value = "查询详情", response = SysColumn.class)
public R findById(@RequestParam("id") @ApiParam(value = "序号") Integer id) { public R findById(@RequestParam("id") @ApiParam(value = "序号") Integer id) {
SysColumn sysColumn = service.getById(id); SysColumn sysColumn = service.getById(id);
/*if (sysColumn == null) {
throw new NotFoundException(BaseResponseCode.DATA_DOES_NOT_EXIST);
}*/
SysTemplateStyle sysTemplateStyle = styleService.getById(sysColumn.getListStyleId()); SysTemplateStyle sysTemplateStyle = styleService.getById(sysColumn.getListStyleId());
if (sysTemplateStyle.getPath() != null) { if (sysTemplateStyle.getPath() != null) {

@ -75,14 +75,14 @@ public class SysContentController {
SysContent sysContent = service.getById(id); SysContent sysContent = service.getById(id);
if (sysContent == null) { /* if (sysContent == null) {
throw new NotFoundException(BaseResponseCode.DATA_DOES_NOT_EXIST); throw new NotFoundException(BaseResponseCode.DATA_DOES_NOT_EXIST);
} }*/
SysColumn sysColumn = columnService.getById(sysContent.getColumnId()); SysColumn sysColumn = columnService.getById(sysContent.getColumnId());
if (sysColumn == null) { /*if (sysColumn == null) {
throw new NotFoundException(BaseResponseCode.DATA_DOES_NOT_EXIST); throw new NotFoundException(BaseResponseCode.DATA_DOES_NOT_EXIST);
} }*/
if (sysColumn.getColumnName() != null) { if (sysColumn.getColumnName() != null) {
sysContent.setColumnName(sysColumn.getColumnName()); sysContent.setColumnName(sysColumn.getColumnName());
} }

Loading…
Cancel
Save