|
@@ -3,6 +3,7 @@ package cc.smtweb.system.bpm.web.design.preview; |
|
|
import cc.smtweb.framework.core.annotation.SwParam; |
|
|
import cc.smtweb.framework.core.annotation.SwParam; |
|
|
import cc.smtweb.framework.core.annotation.SwService; |
|
|
import cc.smtweb.framework.core.annotation.SwService; |
|
|
import cc.smtweb.framework.core.common.R; |
|
|
import cc.smtweb.framework.core.common.R; |
|
|
|
|
|
import cc.smtweb.framework.core.common.SwConsts; |
|
|
import cc.smtweb.framework.core.common.SwEnum; |
|
|
import cc.smtweb.framework.core.common.SwEnum; |
|
|
import cc.smtweb.framework.core.db.DbEngine; |
|
|
import cc.smtweb.framework.core.db.DbEngine; |
|
|
import cc.smtweb.framework.core.db.vo.ModelCatalog; |
|
|
import cc.smtweb.framework.core.db.vo.ModelCatalog; |
|
@@ -31,9 +32,11 @@ public class PreviewMenuTreeService { |
|
|
|
|
|
|
|
|
public R treeAll(@SwParam("module") String module, UserSession us) { |
|
|
public R treeAll(@SwParam("module") String module, UserSession us) { |
|
|
String prj_id = ModelProjectCache.getInstance().getIdByModule(module); |
|
|
String prj_id = ModelProjectCache.getInstance().getIdByModule(module); |
|
|
List<MenuVO> menuVOList = buildMenu(prj_id, module, us); |
|
|
|
|
|
if (PubUtil.isNotEmpty(menuVOList)) { |
|
|
|
|
|
return R.success(menuVOList); |
|
|
|
|
|
|
|
|
if(!SwConsts.SYS_DEBUG){ |
|
|
|
|
|
List<MenuVO> menuVOList = buildMenu(prj_id, module, us); |
|
|
|
|
|
if (PubUtil.isNotEmpty(menuVOList)) { |
|
|
|
|
|
return R.success(menuVOList); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
List<ModelForm> listForm; |
|
|
List<ModelForm> listForm; |
|
|
if (StringUtils.isNotEmpty(prj_id)) { |
|
|
if (StringUtils.isNotEmpty(prj_id)) { |
|
|