Merge branch 'fix_foton_20231213' into 'master'

fix: 计划管控取消流程代办未消除问题修改 See merge request laws-foton-slrs/foton-wkflow-rest!74
2024-01-02 09:58:36 +00:00
parent 2b89ad5e73 acd36ae6c3
commit 18e3d9385b
1 changed files with 10 additions and 0 deletions
@@ -272,6 +272,16 @@ public class BusProcessNewServiceImpl extends ServiceImpl<BusProcessNewMapper, B
                 if (StringUtils.isBlank(esIdMesg)) {
                     esIdMesg = jsonObject.getString("nowEsId");
                 }
+                 // 如果依然是null， 可能是表单嵌套问题，需要再次解析
+                 JSONObject form = jsonObject.getJSONObject("form");
+                 if (form!= null) {
+                    esIdMesg = form.getString("esId");
+                    if (StringUtils.isBlank(esIdMesg)) {
+                        esIdMesg = form.getString("nowEsId");
+                    }
+                 } else {
+                     return false;
+                 }
                 if (StringUtils.isBlank(esIdMesg)) {
                     return false;
                 }