documentVerify orgId

src/main/java/com/huiju/estateagents/controller/TaDocumentVerifyController.java

@@ -59,10 +59,11 @@ public class TaDocumentVerifyController extends BaseController {
     public ResponseBean documentVerifyList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                            @RequestParam(value ="name",required = false) String name,
-                                           @RequestParam(value ="tel",required = false) String tel){
+                                           @RequestParam(value ="tel",required = false) String tel,
+                                           HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            IPage<TaDocumentVerify> result = iTaDocumentVerifyService.getDocumentVerifyList(pageNum,pageSize,name,tel);
+            IPage<TaDocumentVerify> result = iTaDocumentVerifyService.getDocumentVerifyList(pageNum,pageSize,name,tel,getOrgId(request));
             responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();

src/main/java/com/huiju/estateagents/mapper/TaDocumentVerifyMapper.java

@@ -17,6 +17,6 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface TaDocumentVerifyMapper extends BaseMapper<TaDocumentVerify> {
 
-    IPage<TaDocumentVerify> getDocumentVerifyList (IPage<TaDocumentVerify> page, @Param("name") String name, @Param("tel") String tel);
+    IPage<TaDocumentVerify> getDocumentVerifyList (IPage<TaDocumentVerify> page, @Param("name") String name, @Param("tel") String tel,@Param("orgId")Integer orgId);
 
 }

src/main/java/com/huiju/estateagents/service/ITaDocumentVerifyService.java

@@ -14,6 +14,6 @@ import com.huiju.estateagents.entity.TaDocumentVerify;
  */
 public interface ITaDocumentVerifyService extends IService<TaDocumentVerify> {
 
-    IPage<TaDocumentVerify> getDocumentVerifyList (Integer pageNum,Integer pageSize,String name,String tel);
+    IPage<TaDocumentVerify> getDocumentVerifyList (Integer pageNum,Integer pageSize,String name,String tel,Integer orgId);
 
 }

src/main/java/com/huiju/estateagents/service/impl/TaDocumentVerifyServiceImpl.java

@@ -1,8 +1,10 @@
 package com.huiju.estateagents.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.TaApartmentImg;
 import com.huiju.estateagents.entity.TaDocumentImg;
 import com.huiju.estateagents.entity.TaDocumentVerify;
 import com.huiju.estateagents.mapper.TaDocumentImgMapper;
@@ -31,14 +33,17 @@ public class TaDocumentVerifyServiceImpl extends ServiceImpl<TaDocumentVerifyMap
     TaDocumentImgMapper taDocumentImgMapper;
 
     @Override
-    public IPage<TaDocumentVerify> getDocumentVerifyList (Integer pageNum, Integer pageSize, String name, String tel){
+    public IPage<TaDocumentVerify> getDocumentVerifyList (Integer pageNum, Integer pageSize, String name, String tel,Integer orgId){
         IPage<TaDocumentVerify>page = new Page<>(pageNum,pageSize);
-        IPage<TaDocumentVerify> data = documentVerifyMapper.getDocumentVerifyList(page,name,tel);
+        IPage<TaDocumentVerify> data = documentVerifyMapper.getDocumentVerifyList(page,name,tel,orgId);
         List<Integer> idList = new ArrayList<>();
         for (int i = 0; i<data.getRecords().size();i++){
             idList.add(data.getRecords().get(i).getDocumentVerifyId());
         }
-        List<TaDocumentImg>allImgList = taDocumentImgMapper.selectBatchIds(idList);
+        QueryWrapper<TaDocumentImg>imgQueryWrapper = new QueryWrapper<>();
+        imgQueryWrapper.in("document_verify_id",idList);
+        imgQueryWrapper.eq("org_id",orgId);
+        List<TaDocumentImg>allImgList = taDocumentImgMapper.selectList(imgQueryWrapper);
         for (int i = 0;i<data.getRecords().size();i++){
             List<TaDocumentImg>imgList = new ArrayList<>();
             for(int j = 0; j<allImgList.size();j++){

src/main/resources/mapper/TaDocumentVerifyMapper.xml

@@ -10,6 +10,7 @@
 	ta_document_verify a
 	LEFT JOIN ta_person b ON a.person_id = b.person_id
 	where a.status = 1
+	and a.org_id = #{orgId}
 	    <if test="name != '' and name !=null">
             and IFNULL(b.name,b.nickname) like CONCAT('%',#{name}, '%')
          </if>