Merge branch 'develop' into develop2

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

@@ -365,10 +365,15 @@ public class personnelstatistics extends Controller {
         for (Row row : rows) {
             if(hrrows.size()!=0){
                 if(hrrowsMap.containsKey(row.getString("sa_saleareaid"))){
-                    rowsResult.add(row);
+                    if(row.getString("type").equals("区域")){
+                        rowsResult.add(row);
+                    }
+
                 }
             }else{
-                rowsResult.add(row);
+                if(row.getString("type").equals("区域")){
+                    rowsResult.add(row);
+                }
             }
 
 
@@ -389,6 +394,8 @@ public class personnelstatistics extends Controller {
             row.putAll(actualRow);
             row.putAll(calculate(row, actualRow));
         }
+
+
         Row rowResult = new Row();
         rowResult.put("y1l",rowsResult.sum("y1l"));
         rowResult.put("y1a",rowsResult.sum("y1a"));