人员目标bug修复

src/custom/restcontroller/webmanage/sale/salestarget/SQL/人员-目标详情列表.sql

@@ -151,5 +151,5 @@ from (
                 left join sa_salearea t5 on t1.sa_saleareaid = t5.sa_saleareaid
 								 left join sa_salearea t6 on t5.parentid = t6.sa_saleareaid and t5.siteid = t6.siteid
          group by  t6.sa_saleareaid,  t6.areafullname, t6.areaname) t
-where $where$
+where  ifnull(t.areaname,'')!='' and $where$
 order by areafullname, case when t.type = '区域' then 0 else 1 end

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

@@ -301,47 +301,48 @@ public class personnel extends Controller {
         Long sa_saleareaid=0l;
         if(!saleareas.isEmpty() && saleareas.size()==1){
             sa_saleareaid=saleareas.get(0).getLong("sa_saleareaid");
-        }
-
-        for (Row row :rows) {
-            if(row.getLong("parentid")==0 && row.getString("type").equals("区域汇总")){
-                row.put("y1l",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("y1l"));
-                row.put("y1h",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("y1h"));
-                row.put("s1l",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("s1l"));
-                row.put("s1h",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("s1h"));
-                row.put("s2l",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("s2l"));
-                row.put("s2h",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("s2h"));
-                row.put("s3l",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("s3l"));
-                row.put("s3h",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("s3h"));
-                row.put("s4l",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("s4l"));
-                row.put("s4h",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("s4h"));
-                row.put("m1l",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("m1l"));
-                row.put("m1h",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("m1h"));
-                row.put("m2l",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("m2l"));
-                row.put("m2h",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("m2h"));
-                row.put("m3l",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("m3l"));
-                row.put("m3h",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("m3h"));
-                row.put("m4l",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("m4l"));
-                row.put("m4h",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("m4h"));
-                row.put("m5l",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("m5l"));
-                row.put("m5h",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("m5h"));
-                row.put("m6l",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("m6l"));
-                row.put("m6h",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("m6h"));
-                row.put("m7l",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("m7l"));
-                row.put("m7h",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("m7h"));
-                row.put("m8l",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("m8l"));
-                row.put("m8h",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("m8h"));
-                row.put("m9l",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("m9l"));
-                row.put("m9h",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("m9h"));
-                row.put("m10l",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("m10l"));
-                row.put("m10h",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("m10h"));
-                row.put("m11l",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("m11l"));
-                row.put("m11h",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("m11h"));
-                row.put("m12l",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("m12l"));
-                row.put("m12h",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("m12h"));
+            for (Row row :rows) {
+                if(row.getLong("parentid")==0 ){
+                    row.put("y1l",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("y1l"));
+                    row.put("y1h",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("y1h"));
+                    row.put("s1l",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("s1l"));
+                    row.put("s1h",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("s1h"));
+                    row.put("s2l",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("s2l"));
+                    row.put("s2h",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("s2h"));
+                    row.put("s3l",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("s3l"));
+                    row.put("s3h",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("s3h"));
+                    row.put("s4l",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("s4l"));
+                    row.put("s4h",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("s4h"));
+                    row.put("m1l",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("m1l"));
+                    row.put("m1h",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("m1h"));
+                    row.put("m2l",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("m2l"));
+                    row.put("m2h",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("m2h"));
+                    row.put("m3l",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("m3l"));
+                    row.put("m3h",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("m3h"));
+                    row.put("m4l",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("m4l"));
+                    row.put("m4h",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("m4h"));
+                    row.put("m5l",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("m5l"));
+                    row.put("m5h",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("m5h"));
+                    row.put("m6l",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("m6l"));
+                    row.put("m6h",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("m6h"));
+                    row.put("m7l",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("m7l"));
+                    row.put("m7h",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("m7h"));
+                    row.put("m8l",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("m8l"));
+                    row.put("m8h",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("m8h"));
+                    row.put("m9l",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("m9l"));
+                    row.put("m9h",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("m9h"));
+                    row.put("m10l",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("m10l"));
+                    row.put("m10h",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("m10h"));
+                    row.put("m11l",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("m11l"));
+                    row.put("m11h",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("m11h"));
+                    row.put("m12l",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("m12l"));
+                    row.put("m12h",rows.toRowsMap("parentid").get(sa_saleareaid.toString()).sum("m12h"));
+                }
             }
         }
 
+
+
         return getSucReturnObject().setData(rows).toString();
     }