diff --git a/module-form/src/main/java/ink/wgink/module/form/controller/route/design/FormRouteController.java b/module-form/src/main/java/ink/wgink/module/form/controller/route/design/FormRouteController.java index 03191441..a4672598 100644 --- a/module-form/src/main/java/ink/wgink/module/form/controller/route/design/FormRouteController.java +++ b/module-form/src/main/java/ink/wgink/module/form/controller/route/design/FormRouteController.java @@ -1,7 +1,9 @@ package ink.wgink.module.form.controller.route.design; import ink.wgink.interfaces.consts.ISystemConstant; +import ink.wgink.interfaces.menu.IMenuBaseService; import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -18,9 +20,13 @@ import org.springframework.web.servlet.ModelAndView; @RequestMapping(ISystemConstant.ROUTE_PREFIX + "/form") public class FormRouteController { + @Autowired(required = false) + private IMenuBaseService menuBaseService; + @GetMapping("list") public ModelAndView list() { ModelAndView mv = new ModelAndView("form/list"); + mv.addObject("hasMenuService", menuBaseService != null ? true : false); return mv; } diff --git a/module-form/src/main/java/ink/wgink/module/form/service/design/impl/FormServiceImpl.java b/module-form/src/main/java/ink/wgink/module/form/service/design/impl/FormServiceImpl.java index 53d59db0..d289ee71 100644 --- a/module-form/src/main/java/ink/wgink/module/form/service/design/impl/FormServiceImpl.java +++ b/module-form/src/main/java/ink/wgink/module/form/service/design/impl/FormServiceImpl.java @@ -3,6 +3,7 @@ package ink.wgink.module.form.service.design.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import ink.wgink.common.base.DefaultBaseService; +import ink.wgink.exceptions.DependencyException; import ink.wgink.exceptions.ParamsException; import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SearchException; @@ -33,7 +34,7 @@ public class FormServiceImpl extends DefaultBaseService implements IFormService private IFormReportService formReportService; @Autowired private IFormFieldService formFieldService; - @Autowired + @Autowired(required = false) private IMenuBaseService menuBaseService; @Override @@ -228,6 +229,9 @@ public class FormServiceImpl extends DefaultBaseService implements IFormService @Override public void updateToMenu(String formId, String menuParentId) { + if (menuBaseService == null) { + throw new DependencyException("菜单业务未依赖"); + } FormPO formPO = getPO(formId); if (formPO == null) { throw new SearchException("表单不存在"); diff --git a/module-form/src/main/resources/templates/form/list.html b/module-form/src/main/resources/templates/form/list.html index 1f9aaac2..7dabfe04 100644 --- a/module-form/src/main/resources/templates/form/list.html +++ b/module-form/src/main/resources/templates/form/list.html @@ -45,7 +45,7 @@ -