fix: 企业列表

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/mapper/WmDaDrugEntMapper.java

@@ -43,7 +43,7 @@ public interface WmDaDrugEntMapper extends DataScopeMapper<WmDaDrugEnt> {
 	 * @param wmDaDrugEnt 实体对象
 	 * @return 分页列表
 	 */
-	IPage<List<WmDaDrugEnt>> selectPage(Page page, @Param("query") WmDaDrugEnt wmDaDrugEnt);
+	IPage<WmDaDrugEnt> selectPage(Page page, @Param("query") WmDaDrugEnt wmDaDrugEnt);
 
 	List<WmDaDrugEnt> selectByDrugId(WmDaDrugEnt wmDaDrugEnt);
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/WmDaDrugEntService.java

@@ -65,5 +65,5 @@ public interface WmDaDrugEntService extends IService<WmDaDrugEnt> {
 	 * @param wmDaDrugEnt 实体对象
 	 * @return 分页列表
 	 */
-	IPage<List<WmDaDrugEnt>> selectPage(Page page, WmDaDrugEnt wmDaDrugEnt);
+	IPage<WmDaDrugEnt> selectPage(Page page, WmDaDrugEnt wmDaDrugEnt);
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmDaDrugEntServiceImpl.java

@@ -200,17 +200,14 @@ public class WmDaDrugEntServiceImpl extends ServiceImpl<WmDaDrugEntMapper, WmDaD
 	 * @return 分页列表
 	 */
 	@Override
-	public IPage<List<WmDaDrugEnt>> selectPage(Page page, WmDaDrugEnt wmDaDrugEnt) {
-		IPage<List<WmDaDrugEnt>> listIPage = wmDaDrugEntMapper.selectPage(page, wmDaDrugEnt);
+	public IPage<WmDaDrugEnt> selectPage(Page page, WmDaDrugEnt wmDaDrugEnt) {
+		IPage<WmDaDrugEnt> listIPage = wmDaDrugEntMapper.selectPage(page, wmDaDrugEnt);
 
-		listIPage.getRecords().forEach(entList -> {
-
-			entList.forEach( ent -> {
+		listIPage.getRecords().forEach(ent -> {
 				Map<String, Integer> collect = sysDeptSubMapper.selectList(Wrappers.<SysDeptSub>lambdaQuery().eq(SysDeptSub::getDeptId, ent.getDeptId()))
 						.stream()
 						.collect(Collectors.toMap(SysDeptSub::getSubjectType, SysDeptSub::getSubjectChannel));
 				ent.setSubjectTypeAndChannel(collect);
-			});
 		});
 
 		return listIPage;