diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/AreaController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/AreaController.java index 45062813..92868d33 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/AreaController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/AreaController.java @@ -28,6 +28,7 @@ import com.jeesite.common.idgen.IdGen; import com.jeesite.common.lang.StringUtils; import com.jeesite.common.web.BaseController; import com.jeesite.modules.sys.entity.Area; +import com.jeesite.modules.sys.entity.Company; import com.jeesite.modules.sys.service.AreaService; import com.jeesite.modules.sys.utils.AreaUtils; import com.jeesite.modules.sys.utils.UserUtils; @@ -53,6 +54,16 @@ public class AreaController extends BaseController { return areaService.get(areaCode, isNewRecord); } + /** + * 区域管理 + */ + @RequiresPermissions("sys:area:view") + @RequestMapping(value = "index") + public String index(Company area, Model model) { + model.addAttribute("area", area); + return "modules/sys/areaIndex"; + } + /** * 区域列表 * @param area diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/CompanyController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/CompanyController.java index 221b04cd..78d55fa4 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/CompanyController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/CompanyController.java @@ -54,6 +54,16 @@ public class CompanyController extends BaseController { public Company get(String companyCode, boolean isNewRecord) { return companyService.get(companyCode, isNewRecord); } + + /** + * 公司管理 + */ + @RequiresPermissions("sys:company:view") + @RequestMapping(value = "index") + public String index(Company company, Model model) { + model.addAttribute("company", company); + return "modules/sys/companyIndex"; + } /** * 公司列表 diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/OfficeController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/OfficeController.java index 29b5995e..00dfb686 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/OfficeController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/OfficeController.java @@ -53,7 +53,7 @@ public class OfficeController extends BaseController { } /** - * 机构管理主页面 + * 机构管理 */ @RequiresPermissions("sys:office:view") @RequestMapping(value = "index") diff --git a/modules/core/src/main/resources/views/modules/sys/areaIndex.html b/modules/core/src/main/resources/views/modules/sys/areaIndex.html new file mode 100644 index 00000000..069cf6e5 --- /dev/null +++ b/modules/core/src/main/resources/views/modules/sys/areaIndex.html @@ -0,0 +1,71 @@ +<% layout('/layouts/default.html', {title: '公司管理', libs: ['layout','zTree']}){ %> +
+
+
+
+
+ ${text('公司')} +
+
+ + + +
+
+
+
+
+
+
+
+
+ +
+<% } %> + diff --git a/modules/core/src/main/resources/views/modules/sys/companyIndex.html b/modules/core/src/main/resources/views/modules/sys/companyIndex.html new file mode 100644 index 00000000..77841ea3 --- /dev/null +++ b/modules/core/src/main/resources/views/modules/sys/companyIndex.html @@ -0,0 +1,71 @@ +<% layout('/layouts/default.html', {title: '公司管理', libs: ['layout','zTree']}){ %> +
+
+
+
+
+ ${text('公司')} +
+
+ + + +
+
+
+
+
+
+
+
+
+ +
+<% } %> +