Merge branch 'develop' into develop2

src/custom/restcontroller/webmanage/sale/salestarget/SQL/更新新年度.sql

@@ -2,7 +2,7 @@ UPDATE sa_salestargetbill
 SET
     assessmentindicators = $assessmentindicators$,
     sa_accountclassids=$sa_accountclassids$,
-    assessmentindicators=$assessmentindicators$,
+    statisticaldimension=$statisticaldimension$,
     changeuserid=$userid$,
     changeby=$username$
 WHERE sa_salestargetbillid = $sa_salestargetbillid$ and siteid=$siteid$

src/custom/restcontroller/webmanage/sale/salestarget/personnel.java

@@ -265,6 +265,9 @@ public class personnel extends Controller {
             if(isJSONArray(row.getString("statisticaldimension"))){
                 row.put("statisticaldimension",JSONArray.parseArray(row.getString("statisticaldimension")));
             }
+            if(isJSONObject(row.getString("statisticaldimension"))){
+                row.put("statisticaldimension",JSONObject.parseObject(row.getString("statisticaldimension")));
+            }
             if(isJSONArray(row.getString("sa_accountclassids"))){
                 JSONArray sa_accountclassids =JSONArray.parseArray(row.getString("sa_accountclassids"));
                 for (Object object:sa_accountclassids) {