Merge remote-tracking branch 'origin/reg' into reg

fill-manager/src/main/bin/start.sh

@@ -62,7 +62,6 @@ exec "$JAVACMD" $JAVA_OPTS \
 				-Dapp.port="$PORT" \
 				-Dbasedir="$BASEDIR" \
 				-Dfile.encoding=utf-8 \
-				-Djava.io.tmpdir=$TEMP_PATH \
 				-jar $MAIN_CLASS \
 				> /dev/null &
 				

fill-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterDatumServiceImpl.java

@@ -355,6 +355,7 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
         //转换表单参数为map集合
         ObjectMapper mapper = new ObjectMapper();
         ConfigureBuilder builder = Configure.builder();
+        //builder.useSpringEL();
         builder.buildGrammerRegex(RegexUtils.createGeneral("{{", "}}"));
         try {
             Map<String, Object> data = mapper.readValue(docFormVo.getFormContent(), Map.class);
@@ -401,6 +402,14 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
                 //TODO 单选
                 //绑定动态表单
                 if (entry.getKey().indexOf(ComponentEnum.DYNAMIC_TABLE.getValue()) != -1) {
+
+                    ArrayList<Map<String,Object>> listMap = (ArrayList)entry.getValue();
+                    for (Map<String, Object> map : listMap) {
+                        Integer index = (Integer)map.get("index");
+                        if(!ObjectUtils.isEmpty(index)){
+                            map.put("index",index+1);
+                        }
+                    }
                     builder.bind(entry.getKey(), new MultipleRowTableRenderPolicy());
                 }
                 //绑定转换list  list_1_身份证
@@ -426,6 +435,10 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
             if (addMap.size() > 0) {
                 data.putAll(addMap);
             }
+
+            //将data中的list中的index 加1
+
+
             //查询是否有多选框，
             //获取模板文件地址
             MatterDatumEntity docTemplateEntity = this.get(docFormVo.getId(), context);
@@ -433,6 +446,7 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
                 String path = rootPath + docTemplateEntity.getTemplatePath();
                 String templateName = FileUtil.getName(path);
                 Configure config = builder.build();
+
                 XWPFTemplate template = null;
                 ByteArrayOutputStream byteArrayOutputStream = null;
                 try {