客户列表联系人BUG修复

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataStoreContactController.java

@@ -75,8 +75,9 @@ public class BasicdataStoreContactController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入basicdataStoreContact")
-	public R<IPage<BasicdataStoreContactEntity>> list(@ApiIgnore @RequestParam Map<String, Object> basicdataStoreContact, Query query) {
-		IPage<BasicdataStoreContactEntity> pages = basicdataStoreContactService.page(Condition.getPage(query), Condition.getQueryWrapper(basicdataStoreContact, BasicdataStoreContactEntity.class));
+	public R<IPage<BasicdataStoreContactVO>> list(@ApiIgnore @RequestParam Map<String, Object> basicdataStoreContact, Query query) {
+		IPage<BasicdataStoreContactEntity> page = Condition.getPage(query);
+		IPage<BasicdataStoreContactVO> pages = basicdataStoreContactService.pageList(page,basicdataStoreContact);
 		return R.data(pages);
 	}
 

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStoreContactMapper.java

@@ -25,6 +25,7 @@ import com.logpm.basicdata.vo.BasicdataStoreContactVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 基础门店联系人表 Mapper 接口
@@ -52,4 +53,7 @@ public interface BasicdataStoreContactMapper extends BaseMapper<BasicdataStoreCo
 	 */
 	List<BasicdataStoreContactExcel> exportBasicdataStoreContact(@Param("ew") Wrapper<BasicdataStoreContactEntity> queryWrapper);
 
+    IPage<BasicdataStoreContactVO> pageList(IPage<BasicdataStoreContactEntity> page,@Param("param") Map<String, Object> basicdataStoreContact);
+
+
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStoreContactMapper.xml

@@ -18,5 +18,9 @@
     <select id="exportBasicdataStoreContact" resultType="com.logpm.basicdata.excel.BasicdataStoreContactExcel">
         SELECT * FROM logpm_basicdata_store_contact ${ew.customSqlSegment}
     </select>
+    <select id="pageList" resultType="com.logpm.basicdata.vo.BasicdataStoreContactVO">
+        SELECT * FROM logpm_basicdata_store_contact WHERE is_deleted = 0 AND shop_id = #{param.shopId}
+
+    </select>
 
 </mapper>

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataStoreContactService.java

@@ -24,6 +24,7 @@ import com.logpm.basicdata.vo.BasicdataStoreContactVO;
 import org.springblade.core.mp.base.BaseService;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 基础门店联系人表 服务类
@@ -51,4 +52,13 @@ public interface IBasicdataStoreContactService extends BaseService<BasicdataStor
 	List<BasicdataStoreContactExcel> exportBasicdataStoreContact(Wrapper<BasicdataStoreContactEntity> queryWrapper);
 
     Boolean ownUpdateById(BasicdataStoreContactEntity basicdataStoreContact);
+
+	/**
+	 * 商场联系人查询
+	 * @param page
+	 * @param basicdataStoreContact
+	 * @return
+	 */
+    IPage<BasicdataStoreContactVO> pageList(IPage<BasicdataStoreContactEntity> page, Map<String, Object> basicdataStoreContact);
+
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStoreContactServiceImpl.java

@@ -33,6 +33,7 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -101,4 +102,9 @@ public class BasicdataStoreContactServiceImpl extends BaseServiceImpl<BasicdataS
 
 	}
 
+	@Override
+	public IPage<BasicdataStoreContactVO> pageList(IPage<BasicdataStoreContactEntity> page, Map<String, Object> basicdataStoreContact) {
+		return baseMapper.pageList(page,basicdataStoreContact);
+	}
+
 }