commit

src/main/java/com/budwk/app/zhgh/dayofficework/ghkh/controller/GhkhXghshController.java

@@ -86,7 +86,7 @@ public class GhkhXghshController {
         if (Strings.isNotBlank(pageOrderName) && Strings.isNotBlank(pageOrderBy)) {
             cnd.orderBy(pageOrderName, pageOrderBy);
         }
-        cnd.groupBy("re.union_id");
+        cnd.groupBy("zb_id, re.union_id");
         sql.setCondition(cnd);
         return Result.success(khXghshService.listPage(pageNumber, pageSize, sql));
     }
@@ -111,8 +111,8 @@ public class GhkhXghshController {
                     bz.setZp(zp);
                 }
 				Kh_xghsh xghsh = khZbService.dao().fetch(Kh_xghsh.class, Cnd.where("bz_id", "=", bz.getId()).and("flatid", "=", union_id));
-				bz.setSchools(xghsh.getSchools());
-				bz.setAddition(xghsh.getAddition());
+				bz.setSchools(xghsh != null ? xghsh.getSchools() : 0);
+				bz.setAddition(xghsh != null ? xghsh.getAddition() : "");
 			});
         });
         return Result.success(khzb);