全所统计

jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java

@@ -151,7 +151,13 @@ public class PayCaseCommitteeSubitemController extends JeroController<PayCaseCom
 //		ids为空表示搜索导出
 		if (StringUtils.isBlank(ids)) {
 			List<ChooseExcelWorkingGroup> list = payCaseCommitteeSubitemService.listForExcel(contactsName, companyName, fenBiaoWeiName);
-			return getModelAndView(list);
+			ArrayList<ChooseExcelWorkingGroup> objects = new ArrayList<>();
+			for(ChooseExcelWorkingGroup c:list){
+				if(StringUtils.isNotBlank(c.getCompanyName())){
+					objects.add(c);
+				}
+			}
+			return getModelAndView(objects);
 		} else {
 			ArrayList<String> idList = new ArrayList<>(Arrays.asList(ids.split(",")));
 			List<ChooseExcelWorkingGroup> list= payCaseCommitteeSubitemService.chooseExcel(idList);

jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml

@@ -29,6 +29,7 @@
                 AND pe.name LIKE CONCAT('%',#{fenBiaoWeiName},'%')
             </if>
         </where>
+        group by pe.id
         order by pe.create_time desc
     </select>
     <select id="listForChildren" resultType="com.jero.data.entity.ChildrenFindByName">
@@ -66,7 +67,7 @@
                 AND pe.name LIKE CONCAT('%',#{fenBiaoWeiName},'%')
             </if>
         </where>
-
+        order by pe.create_time desc
 
     </select>