|
|
@@ -86,7 +86,7 @@ public class RtrServerImpl implements RtrServer {
|
|
|
//获取子表
|
|
|
if (type.equals("YWJT")) {
|
|
|
JSONArray itemArray = new JSONArray();
|
|
|
- Boolean isOtherTypeFor = formUuid.equals("FORM-66A4F00A1E0E4E67B607D4119B88CEF6FBP6")&&"其他".equals(UtilMap.getString(dataForm,"radioField_mj1hb0kj"));
|
|
|
+ Boolean isOtherTypeFor = (formUuid.equals("FORM-66A4F00A1E0E4E67B607D4119B88CEF6FBP6")||formUuid.equals("FORM-2CB3F7D8B4224AB9972A8C24CDBF3464C1OU"))&&"其他".equals(UtilMap.getString(dataForm,"radioField_mj1hb0kj"));
|
|
|
int x = 1;//OA单据行号累计用
|
|
|
List<Map> tableFils = ydService.queryDetails(YDParam.builder().formInstanceId(InstanceId).formUuid(formUuid).tableFieldId(isOtherTypeFor?"tableField_mk7rt61h":"tableField_mipgl0vx").build());
|
|
|
if (tableFils != null && tableFils.size() > 0) {
|
lfx