商户信息查询，新增修改申请内容返回

src/dsb/com/cnd3b/restcontroller/customer/tagents/tagents.java

@@ -40,6 +40,21 @@ public class tagents extends Controller {
             modifyapp.addParameter("tagentsid", tagentsid);
             Rows modifyapprows = dbConnect.runSqlQuery(modifyapp.getSQL());
             row.put("fisauthenticating", modifyapprows.isEmpty() ? 0 : 1);
+
+            //ÐÞ¸ÄÉêÇë²éѯ
+            Rows tagents_msgchangeappRows = dbConnect.runSqlQuery("select fchangemsg,ftype,tagents_msgchangappid from tagents_msgchangeapp where fstatus='ÉêÇë' and siteid='" + siteid + "' and tagentsid='" + tagentsid + "'");
+            if (tagents_msgchangeappRows.isEmpty()) {
+                row.put("msgchangeapp", "{}");
+            } else {
+                String ftype = tagents_msgchangeappRows.get(0).getString("ftype");
+                String fchangemsg = tagents_msgchangeappRows.get(0).getString("fchangemsg");
+                long tagents_msgchangappid = tagents_msgchangeappRows.get(0).getLong("tagents_msgchangappid");
+                JSONObject msgchangeappObject = new JSONObject();
+                msgchangeappObject.put("ftype", ftype);
+                msgchangeappObject.put("fchangemsg", JSONObject.parseObject(fchangemsg));
+                msgchangeappObject.put("tagents_msgchangappid", tagents_msgchangappid);
+                row.put("msgchangeapp", msgchangeappObject);
+            }
         }
         return getSucReturnObject().setData(rows).toString();
     }

src/dsb/com/cnd3b/restcontroller/system/system/docManage.java

@@ -359,6 +359,7 @@ public class docManage extends Controller {
         }
         return resultObject.toString();
     }
+
     public String uploadSuccesses() {
         JSONArray obsfilenamesArray = content.getJSONArray("obsfilenames");
 
@@ -488,7 +489,7 @@ public class docManage extends Controller {
             }
         } else {
             resultObject.put("code", 0);
-            resultObject.put("msg", "ÉÏ´«Ê§°Ü");
+            resultObject.put("msg", "ÉÏ´«Ê§°Ü" + fstatus);
         }
         resultObject.put("data", queryDocRows(ownertable, ownerid));
         return resultObject.toString();