文档模板管理和创建项目创建人添加到项目负责人中

src/main/java/com/jeeplus/modules/projectrecord/service/ProjectRecordsService.java

@@ -660,6 +660,15 @@ public class ProjectRecordsService extends CrudService<ProjectRecordsDao, Projec
 
 		//保存项目负责人(新添代码start)
 		List<User> lds = projectRecords.getProjectLeaders();
+		List<String> principalList = new ArrayList<>();
+		for (User user: lds) {
+			principalList.add(user.getId());
+		}
+
+		//判断登记者是否包含在项目负责人之中，如不在，将登记者添加到项目负责人中
+		if(!principalList.contains(projectRecords.getCreateBy().getId())){
+			lds.add(projectRecords.getCreateBy());
+		}
 		User user2=new User();
 
 		//(end)

src/main/java/com/jeeplus/modules/projectreportnum/web/ProjectReportNumController.java

@@ -220,7 +220,9 @@ public class ProjectReportNumController extends BaseController {
 			cfg.setDefaultEncoding("UTF-8");
 
 			//前台传入的tempType即是对应ftl模板的文件名
-			template = cfg.getTemplate("current.ftl","UTF-8");
+			//template = cfg.getTemplate("current.ftl","UTF-8");
+			//若使用上传doc生成模板的功能则需要将其改为GBK
+			template = cfg.getTemplate("current.ftl","GBK");
 
 			//freemarker参数值准备
 			Map<String,Object> data  = new HashMap<>();