Commit cd386b77 by naan1993

修复添加顶级部门和代码生成的bug

parent 39d2c2e3
# 多机环境部署注意事项 # 多机环境部署注意事项
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
多机环境把session托管给redis存储,所以要部署和配置redis,另外需要注意的是开启相关配置 多机环境把session托管给redis存储,所以要部署和配置redis,另外需要注意的是开启相关配置
## 注意事项如下 ## 注意事项如下
1.单机环境下不需要依赖spring-session,所以需要把相关依赖改为compoile 1.单机环境下不需要依赖spring-session,所以需要把相关依赖的注释打开
``` ```
<dependency> <dependency>
<groupId>org.springframework.session</groupId> <groupId>org.springframework.session</groupId>
......
package com.stylefeng.guns.core.template.engine.base; package com.stylefeng.guns.core.template.engine.base;
import com.stylefeng.guns.core.util.ToolUtil; import com.stylefeng.guns.core.util.ToolUtil;
import com.sun.javafx.PlatformUtil;
import org.beetl.core.Configuration; import org.beetl.core.Configuration;
import org.beetl.core.GroupTemplate; import org.beetl.core.GroupTemplate;
import org.beetl.core.Template; import org.beetl.core.Template;
...@@ -53,7 +54,11 @@ public abstract class GunsTemplateEngine extends AbstractTemplateEngine { ...@@ -53,7 +54,11 @@ public abstract class GunsTemplateEngine extends AbstractTemplateEngine {
public void generateFile(String template,String filePath){ public void generateFile(String template,String filePath){
Template pageTemplate = groupTemplate.getTemplate(template); Template pageTemplate = groupTemplate.getTemplate(template);
configTemplate(pageTemplate); configTemplate(pageTemplate);
filePath = filePath.replaceAll("\\\\",File.separator); if(PlatformUtil.isLinux()){
filePath = filePath.replaceAll("/+|\\\\+","/");
}else{
filePath = filePath.replaceAll("/+|\\\\+","\\\\");
}
File file = new File(filePath); File file = new File(filePath);
File parentFile = file.getParentFile(); File parentFile = file.getParentFile();
if(!parentFile.exists()){ if(!parentFile.exists()){
......
...@@ -158,7 +158,7 @@ public class DeptController extends BaseController { ...@@ -158,7 +158,7 @@ public class DeptController extends BaseController {
} }
private void deptSetPids(Dept dept) { private void deptSetPids(Dept dept) {
if (ToolUtil.isEmpty(dept.getPid()) || dept.getPid().equals("0")) { if (ToolUtil.isEmpty(dept.getPid()) || dept.getPid().equals(0)) {
dept.setPid(0); dept.setPid(0);
dept.setPids("[0],"); dept.setPids("[0],");
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment