调整

src/main/java/com/qs/serve/common/model/dto/R.java

@@ -148,6 +148,10 @@ public class R<T> implements Serializable {
     }
 
     public static <TYPE> R<PageVo<TYPE>> byPageHelperList(List<TYPE> data){
+        return R.ok(buildPageHelperList(data));
+    }
+
+    public static <TYPE> PageVo<TYPE> buildPageHelperList(List<TYPE> data){
         PageVo<TYPE> pageVo = new PageVo<>();
         PageInfo<TYPE> pageInfo = new PageInfo<>(data);
         pageVo.setPageSize(pageInfo.getPageSize());
@@ -155,7 +159,7 @@ public class R<T> implements Serializable {
         pageVo.setTotal(pageInfo.getTotal());
         pageVo.setList(data);
         pageVo.setTotalPage(new Long(pageInfo.getPages()));
-        return R.ok(pageVo);
+        return pageVo;
     }
 
     public static <TYPE> R<PageVo<TYPE>> byEmptyList(){

src/main/java/com/qs/serve/modules/bms/controller/BmsChannelController.java

@@ -138,7 +138,7 @@ public class BmsChannelController {
     public R<?> deleteById(@PathVariable("id") Long id){
         LambdaQueryWrapper<TbsActivityChannel> lqw = new LambdaQueryWrapper<>();
         lqw.eq(TbsActivityChannel::getChannelId,id);
-        if(activityChannelService.count()>0){
+        if(activityChannelService.count(lqw)>0){
             return R.error("活动含当前渠道，删除失败");
         }
 

src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java

@@ -2,6 +2,7 @@ package com.qs.serve.modules.bms.controller;
 
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.qs.serve.common.framework.redis.RedisService;
 import com.qs.serve.common.model.annotation.SysLog;
@@ -109,12 +110,14 @@ public class BmsSupplierController {
             List<String> userIds = sysPostUserService.listByChildIds(userId);
             userIds.add(userId);
             HisUserSupplier userSupplier = param.toHisUserSupplier(null,null);
-            LambdaQueryWrapper<HisUserSupplier> lqw = new LambdaQueryWrapper<>(userSupplier);
-            lqw.in(HisUserSupplier::getUserId,userIds);
-            lqw.ne(HisUserSupplier::getSupplierId,0);
+            QueryWrapper<HisUserSupplier> lqw = new QueryWrapper<>(userSupplier);
+            lqw.select("distinct his_user_supplier.supplier_id");
+            lqw.lambda().in(HisUserSupplier::getUserId,userIds)
+                    .ne(HisUserSupplier::getSupplierId,0);
             PageHelper.startPage(param.getPageNum(),param.getPageSize());
             List<HisUserSupplier> list = hisUserSupplierService.list(lqw);
-            List<BmsSupplier> supplierList = list.stream().map(HisUserSupplier::toSupplier).collect(Collectors.toList());
+            List<Long> supplierIds = list.stream().map(HisUserSupplier::getSupplierId).collect(Collectors.toList());
+            List<BmsSupplier> supplierList = bmsSupplierService.listByIds(supplierIds);
             return R.byPageHelperList(list,supplierList);
         }
         PageHelper.startPage(param.getPageNum(),param.getPageSize());

src/main/java/com/qs/serve/modules/bms/controller/my/BmsSupplierContactsMyController.java

@@ -40,6 +40,7 @@ public class BmsSupplierContactsMyController {
 
     private final HisUserSupplierService hisUserSupplierService;
     private BmsSupplierContactsService bmsSupplierContactsService;
+    private BmsSupplierService bmsSupplierService;
 
 
     /**
@@ -49,11 +50,8 @@ public class BmsSupplierContactsMyController {
      */
     @GetMapping("/page")
     public R<PageVo<BmsSupplierContacts>> getPage(BmsSupplierContactsSo param){
-
-        List<HisUserSupplier> list = hisUserSupplierService.selectSupplier(null,false);
-        List<BmsSupplier> supplierList = list.stream().map(HisUserSupplier::toSupplier).collect(Collectors.toList());
-        List<String> supplierIds = supplierList.stream().map(a->a.getId()).distinct().collect(Collectors.toList());
-
+        List<HisUserSupplier> hisUserSuppliers = hisUserSupplierService.selectHisSupplier(null,false);
+        List<Long> supplierIds = hisUserSuppliers.stream().map(HisUserSupplier::getSupplierId).collect(Collectors.toList());
         PageUtil.startPage();
         BmsSupplierContacts query = CopierUtil.copy(param,new BmsSupplierContacts());
         LambdaQueryWrapper<BmsSupplierContacts> contactsLambdaQueryWrapper = new LambdaQueryWrapper<>(query);

src/main/java/com/qs/serve/modules/bms/controller/my/BmsSupplierMyController.java

@@ -4,12 +4,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.qs.serve.common.model.dto.PageVo;
 import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.util.AuthContextUtils;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.TreeUtil;
+import com.qs.serve.common.util.*;
+import com.qs.serve.modules.bms.entity.BmsRegion;
+import com.qs.serve.modules.bms.entity.BmsRegion2;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.entity.vo.BmsSupplierTreeVo;
+import com.qs.serve.modules.bms.service.BmsRegion2Service;
+import com.qs.serve.modules.bms.service.BmsRegionService;
 import com.qs.serve.modules.bms.service.BmsSupplierService;
 import com.qs.serve.modules.his.entity.HisUserSupplier;
 import com.qs.serve.modules.his.service.HisUserSupplierService;
@@ -39,6 +40,8 @@ import java.util.stream.Collectors;
 @RequestMapping("/my/supplier")
 public class BmsSupplierMyController {
 
+    private BmsRegionService bmsRegionService;
+    private BmsRegion2Service bmsRegion2Service;
     private final BmsSupplierService bmsSupplierService;
     private final HisUserSupplierService hisUserSupplierService;
     private SysPostUserService postUserService;
@@ -50,9 +53,9 @@ public class BmsSupplierMyController {
      */
     @GetMapping("/page")
     public R<PageVo<BmsSupplier>> getPage(BmsSupplier param){
-        List<HisUserSupplier> list = hisUserSupplierService.selectSupplier(param,true);
-        List<BmsSupplier> supplierList = list.stream().map(HisUserSupplier::toSupplier).collect(Collectors.toList());
-        return R.byPageHelperList(list,supplierList);
+        PageVo<BmsSupplier> pageVo = hisUserSupplierService.selectPageSupplier(param);
+        initSupplierList(pageVo.getList());
+        return R.ok(pageVo);
     }
 
     /**
@@ -65,9 +68,9 @@ public class BmsSupplierMyController {
         List<String> childIds = postUserService.listByChildIds(AuthContextUtils.getSysUserId());
         param.setSelectUserIds(childIds);
         param.setSelectUserIdsFlag(true);
-        List<HisUserSupplier> list = hisUserSupplierService.selectSupplier(param,true);
-        List<BmsSupplier> supplierList = list.stream().map(HisUserSupplier::toSupplier).collect(Collectors.toList());
-        return R.byPageHelperList(list,supplierList);
+        PageVo<BmsSupplier> pageVo = hisUserSupplierService.selectPageSupplier(param);
+        initSupplierList(pageVo.getList());
+        return R.ok(pageVo);
     }
 
     /**
@@ -81,9 +84,52 @@ public class BmsSupplierMyController {
         childIds.add(AuthContextUtils.getSysUserId());
         param.setSelectUserIds(childIds);
         param.setSelectUserIdsFlag(true);
-        List<HisUserSupplier> list = hisUserSupplierService.selectSupplier(param,true);
-        List<BmsSupplier> supplierList = list.stream().map(HisUserSupplier::toSupplier).collect(Collectors.toList());
-        return R.byPageHelperList(list,supplierList);
+        PageVo<BmsSupplier> pageVo = hisUserSupplierService.selectPageSupplier(param);
+        initSupplierList(pageVo.getList());
+        return R.ok(pageVo);
+    }
+
+
+
+    /**
+     * 显示关联
+     * @param list
+     */
+    private void initSupplierList(List<BmsSupplier> list){
+        for (BmsSupplier supplier : list) {
+            String regionId = null;
+            if(StringUtils.isNotEmpty(supplier.getRegionFourthly())){
+                regionId = supplier.getRegionFourthly();
+            }else if(StringUtils.isNotEmpty(supplier.getRegionThird())){
+                regionId = supplier.getRegionThird();
+            }else if (StringUtils.isNotEmpty(supplier.getRegionSecond())){
+                regionId = supplier.getRegionSecond();
+            }else if (StringUtils.isNotEmpty(supplier.getRegionFirst())){
+                regionId = supplier.getRegionFirst();
+            }
+            if(regionId!=null){
+                BmsRegion region = bmsRegionService.getById(regionId);
+                if(region!=null){
+                    supplier.setRegionLabel(region.getName());
+                }
+            }
+            String region2Id = null;
+            if(StringUtils.isNotEmpty(supplier.getRegion2Fourthly())){
+                region2Id = supplier.getRegion2Fourthly();
+            }else if(StringUtils.isNotEmpty(supplier.getRegion2Third())){
+                region2Id = supplier.getRegion2Third();
+            }else if (StringUtils.isNotEmpty(supplier.getRegion2Second())){
+                region2Id = supplier.getRegion2Second();
+            }else if (StringUtils.isNotEmpty(supplier.getRegion2First())){
+                region2Id = supplier.getRegion2First();
+            }
+            if(region2Id!=null){
+                BmsRegion2 region = bmsRegion2Service.getById(region2Id);
+                if(region!=null){
+                    supplier.setRegion2Label(region.getName());
+                }
+            }
+        }
     }
 
 }

src/main/java/com/qs/serve/modules/bms/service/BmsSupplierService.java

@@ -30,6 +30,8 @@ public interface BmsSupplierService extends IService<BmsSupplier> {
 
     List<BmsSupplier> listByRegion2Id(String regionId);
 
+    List<BmsSupplier> listByRegionIds(List<String> regionIds,Integer level);
+
     void editBatch(BmsSupplierBatchBo param);
 
     void flashParentId();

src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegionServiceImpl.java

@@ -39,7 +39,7 @@ public class BmsRegionServiceImpl extends ServiceImpl<BmsRegionMapper,BmsRegion>
     private SysUserService sysUserService;
     private BmsChannelPointMapper bmsChannelPointMapper;
     private BmsFactoryService bmsFactoryService;
-    private HisUserChannelPointService hisUserChannelPointService;
+    private BmsSupplierApplicationService bmsSupplierApplicationService;
 
     @Override
     public boolean saveBmsRegion(BmsRegion param){
@@ -60,8 +60,11 @@ public class BmsRegionServiceImpl extends ServiceImpl<BmsRegionMapper,BmsRegion>
         if(!ori.getName().equals(param.getName())||changePid) {
             BmsRegion parentRegion = this.updatePathByPid(param.getId());
             if(changePid){
+                /*停用的逻辑
                 hisUserChannelPointService.removeRegion(2,ori.getPathIds());
-                hisUserChannelPointService.flushRegion(2,parentRegion.getPathIds());
+                hisUserChannelPointService.flushRegion(2,parentRegion.getPathIds());*/
+                //todo 更新客户
+                //bmsSupplierApplicationService.listByRegionIds()
             }
         }
         return b;

src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierApplicationService.java

@@ -7,6 +7,8 @@ import com.qs.serve.common.util.CollectionUtil;
 import com.qs.serve.common.util.CopierUtil;
 import com.qs.serve.modules.bms.entity.BmsRegion;
 import com.qs.serve.modules.bms.entity.BmsRegion2;
+import com.qs.serve.modules.bms.entity.BmsSupplier;
+import com.qs.serve.modules.bms.mapper.BmsSupplierMapper;
 import com.qs.serve.modules.bms.service.BmsRegion2Service;
 import com.qs.serve.modules.bms.service.BmsRegionService;
 import com.qs.serve.modules.tbs.common.TbsCenterType;
@@ -47,6 +49,7 @@ public class BmsSupplierApplicationService {
     private TbsBudgetConditionMapper budgetConditionMapper;
     private TbsScheduleItemBudgetMapper scheduleItemBudgetMapper;
     private TbsActivityMapper activityMapper;
+    private BmsSupplierMapper bmsSupplierMapper;
 
     /**
      * 客户更新区域时，预算政策统计
@@ -297,4 +300,28 @@ public class BmsSupplierApplicationService {
         }
     }
 
+    public List<BmsSupplier> listByRegionIds(List<String> regionIds, Integer level) {
+        if(regionIds.size()>0){
+            LambdaQueryWrapper<BmsSupplier> lqw = new LambdaQueryWrapper<>();
+            if(level.equals(1)){
+                lqw.and(
+                        aa->aa.in(BmsSupplier::getRegionFirst,regionIds)
+                                .or().in(BmsSupplier::getRegion2First,regionIds)
+                );
+            }else if(level.equals(2)){
+                lqw.and(
+                        aa->aa.in(BmsSupplier::getRegionSecond,regionIds)
+                                .or().in(BmsSupplier::getRegion2Second,regionIds)
+                );
+            }else if(level.equals(3)){
+                lqw.and(
+                        aa->aa.in(BmsSupplier::getRegionThird,regionIds)
+                                .or().in(BmsSupplier::getRegion2Third,regionIds)
+                );
+            }
+            return bmsSupplierMapper.selectList(lqw);
+        }
+        return new ArrayList<>();
+    }
+
 }

src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierServiceImpl.java

@@ -168,6 +168,11 @@ public class BmsSupplierServiceImpl extends ServiceImpl<BmsSupplierMapper,BmsSup
         return this.list(lqw);
     }
 
+    @Override
+    public List<BmsSupplier> listByRegionIds(List<String> regionIds, Integer level) {
+        return supplierApplicationService.listByRegionIds(regionIds, level);
+    }
+
     @Override
     public void editBatch(BmsSupplierBatchBo batchBo) {
         for (BmsSupplierBatchBo.BmsSupplierDto param : batchBo.getSupplierList()) {

src/main/java/com/qs/serve/modules/his/service/HisUserSupplierService.java

@@ -1,6 +1,7 @@
 package com.qs.serve.modules.his.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.qs.serve.common.model.dto.PageVo;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.his.entity.HisUserSupplier;
 
@@ -13,7 +14,11 @@ import java.util.List;
  */
 public interface HisUserSupplierService extends IService<HisUserSupplier> {
 
-    List<HisUserSupplier> selectSupplier(BmsSupplier param,boolean usePage);
+    List<HisUserSupplier> selectHisSupplier(BmsSupplier param,boolean usePage);
+
+    List<BmsSupplier> selectListSupplier(BmsSupplier param);
+
+    PageVo<BmsSupplier> selectPageSupplier(BmsSupplier param);
 
 
     boolean initByUserId(String userId,boolean hasCheck);

src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierServiceImpl.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
+import com.qs.serve.common.model.dto.PageVo;
+import com.qs.serve.common.model.dto.R;
 import com.qs.serve.common.util.AuthContextUtils;
 import com.qs.serve.common.util.CollectionUtil;
 import com.qs.serve.common.util.PageUtil;
@@ -43,7 +45,7 @@ public class HisUserSupplierServiceImpl extends ServiceImpl<HisUserSupplierMappe
     private SysPostUserService sysPostUserService;
 
     @Override
-    public List<HisUserSupplier> selectSupplier(BmsSupplier param, boolean usePage) {
+    public List<HisUserSupplier> selectHisSupplier(BmsSupplier param, boolean usePage) {
         if(param==null){
             param = new BmsSupplier();
         }
@@ -61,15 +63,32 @@ public class HisUserSupplierServiceImpl extends ServiceImpl<HisUserSupplierMappe
             return new ArrayList<>();
         }
         HisUserSupplier userSupplier = param.toHisUserSupplier(null,null);
-        LambdaQueryWrapper<HisUserSupplier> lqw = new LambdaQueryWrapper<>(userSupplier);
-        lqw.in(HisUserSupplier::getUserId,userIds);
-        lqw.ne(HisUserSupplier::getSupplierId,0);
+        QueryWrapper<HisUserSupplier> lqw = new QueryWrapper<>(userSupplier);
+        lqw.select("distinct his_user_supplier.supplier_id");
+        lqw.lambda().in(HisUserSupplier::getUserId,userIds)
+                .ne(HisUserSupplier::getSupplierId,0);
         if(usePage){
             PageUtil.startPage();
         }
         return this.list(lqw);
     }
 
+    @Override
+    public List<BmsSupplier> selectListSupplier(BmsSupplier param) {
+        List<HisUserSupplier> hisUserSuppliers = selectHisSupplier(param,false);
+        List<Long> supplierIds = hisUserSuppliers.stream().map(HisUserSupplier::getSupplierId).collect(Collectors.toList());
+        List<BmsSupplier> supplierList = bmsSupplierService.listByIds(supplierIds);
+        return supplierList;
+    }
+
+    @Override
+    public PageVo<BmsSupplier> selectPageSupplier(BmsSupplier param) {
+        List<HisUserSupplier> hisUserSuppliers = selectHisSupplier(param,true);
+        List<Long> supplierIds = hisUserSuppliers.stream().map(HisUserSupplier::getSupplierId).collect(Collectors.toList());
+        List<BmsSupplier> supplierList = bmsSupplierService.listByIds(supplierIds);
+        return R.buildPageHelperList(supplierList);
+    }
+
     @Override
     public boolean checkInit(String userId) {
         LambdaQueryWrapper<HisUserSupplier> lqwExist = new LambdaQueryWrapper<>();
@@ -159,24 +178,7 @@ public class HisUserSupplierServiceImpl extends ServiceImpl<HisUserSupplierMappe
 
     private void toHisUserSupplier(List<HisUserSupplier> userSuppliers,Integer type,List<String> regionIds,Integer level,String userId){
         if(regionIds.size()>0){
-            LambdaQueryWrapper<BmsSupplier> lqw = new LambdaQueryWrapper<>();
-            if(level.equals(1)){
-                lqw.and(
-                        aa->aa.in(BmsSupplier::getRegionFirst,regionIds)
-                                .or().in(BmsSupplier::getRegion2First,regionIds)
-                );
-            }else if(level.equals(2)){
-                lqw.and(
-                        aa->aa.in(BmsSupplier::getRegionSecond,regionIds)
-                                .or().in(BmsSupplier::getRegion2Second,regionIds)
-                );
-            }else if(level.equals(3)){
-                lqw.and(
-                        aa->aa.in(BmsSupplier::getRegionThird,regionIds)
-                                .or().in(BmsSupplier::getRegion2Third,regionIds)
-                );
-            }
-            List<BmsSupplier> supplierList = bmsSupplierService.list(lqw);
+            List<BmsSupplier> supplierList = bmsSupplierService.listByRegionIds(regionIds,level);
             for (BmsSupplier supplier : supplierList) {
                 HisUserSupplier userSupplier = supplier.toHisUserSupplier(userId,type);
                 userSuppliers.add(userSupplier);

src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java

@@ -529,7 +529,7 @@ public class TbsBudgetApplicationService {
                     lastAmount = BigDecimal.ZERO;
                 }
                 //判断是否够用
-                if(budgetAmount.subtract(lastAmount).subtract(totalUsed).compareTo(goodsAmount)>0){
+                if(budgetAmount.subtract(lastAmount).subtract(totalUsed).compareTo(goodsAmount)>-1){
                     activityCostItem.setBudgetId(itemBudget.getBudgetId());
                     activityCostItem.setScheduleId(itemBudget.getScheduleId());
                     activityCostItem.setScheduleItemId(itemBudget.getScheduleItemId());

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java

@@ -95,6 +95,8 @@ public class TbsBudgetServiceImpl extends ServiceImpl<TbsBudgetMapper,TbsBudget>
 //        if(sameCondition){
 //            Assert.throwEx("已存在相同条件预算");
 //        }
+        budget.setBudgetCode(budgetBo.getBudgetCode());
+        budget.setSubjectId(budgetBo.getSubjectId());
         BmsSubject subject = null;
         if(budget.getSubjectId()!=0L){
             subject = subjectService.getById(budgetBo.getSubjectId());

src/main/resources/mapper/bms/BmsSupplierChannelMapper.xml

@@ -56,7 +56,7 @@
 
             <if test="query.channelName != null and query.channelName != ''"> and `bms_channel`.`channel_name` LIKE CONCAT('%',#{query.channelName},'%') </if>
             <if test="query.channelCode != null and query.channelCode != ''"> and `bms_channel`.`channel_code` LIKE CONCAT('%',#{query.channelCode},'%') </if>
-            <if test="query.channelName != null and query.channelName != ''"> and `bms_channel`.`channel_type` = #{query.channelType} </if>
+            <if test="query.channelType != null and query.channelType != ''"> and `bms_channel`.`channel_type` = #{query.channelType} </if>
 
             <if test="query.supplierName != null and query.supplierName != ''"> and `bms_supplier`.`name` LIKE CONCAT('%',#{query.supplierName},'%') </if>
             <if test="query.supplierCode != null and query.supplierCode != ''"> and `bms_supplier`.`code` LIKE CONCAT('%',#{query.supplierCode},'%')</if>

src/main/resources/mapper/his/HisUserSupplierMapper.xml

@@ -4,28 +4,6 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.qs.serve.modules.his.mapper.HisUserSupplierMapper">
 
-    <resultMap id="hisUserSupplierMap" type="com.qs.serve.modules.his.entity.HisUserSupplier" >
-        <result property="id"  column="id"/>
-        <result property="userId"  column="user_id"/>
-        <result property="supplierId"  column="supplier_id"/>
-        <result property="supplierName"  column="supplier_name"/>
-        <result property="supplierCode"  column="supplier_code"/>
-        <result property="type"  column="type"/>
-        <result property="regionId"  column="region_id"/>
-        <result property="saleRegionFirst"  column="sale_region_first"/>
-        <result property="saleRegionSecond"  column="sale_region_second"/>
-        <result property="saleRegionThird"  column="sale_region_third"/>
-        <result property="saleRegionFourthly"  column="sale_region_fourthly"/>
-        <result property="masterFlag"  column="master_flag"/>
-        <result property="createTime"  column="create_time"/>
-        <result property="bizRegionFirst"  column="biz_region_first"/>
-        <result property="bizRegionSecond"  column="biz_region_second"/>
-        <result property="bizRegionThird"  column="biz_region_third"/>
-        <result property="bizRegionFourthly"  column="biz_region_fourthly"/>
-        <result property="costFlag"  column="cost_flag"/>
-        <result property="addressId"  column="address_id"/>
-        <result property="addressDetail"  column="address_detail"/>
-    </resultMap>
 
     <resultMap id="supplierVisitAddressMap" type="com.qs.serve.modules.his.entity.dto.HisUserSupplierAddressVo" >
         <result property="supplierId"  column="supplier_id"/>
@@ -33,27 +11,6 @@
         <result property="distance"  column="distance"/>
     </resultMap>
 
-    <sql id="hisUserSupplierSql">
-        his_user_supplier.`id`,
-        his_user_supplier.`user_id`,
-        his_user_supplier.`supplier_id`,
-        his_user_supplier.`supplier_name`,
-        his_user_supplier.`supplier_code`,
-        his_user_supplier.`type`,
-        his_user_supplier.`region_id`,
-        his_user_supplier.`sale_region_first`,
-        his_user_supplier.`sale_region_second`,
-        his_user_supplier.`sale_region_third`,
-        his_user_supplier.`sale_region_fourthly`,
-        his_user_supplier.`master_flag`,
-        his_user_supplier.`create_time`,
-        his_user_supplier.`biz_region_first`,
-        his_user_supplier.`biz_region_second`,
-        his_user_supplier.`biz_region_third`,
-        his_user_supplier.`biz_region_fourthly`,
-        his_user_supplier.`tenant_id`,
-        his_user_supplier.`cost_flag`    </sql>
-
     <select id="selectHisUserSupplierAddressList" parameterType="com.qs.serve.modules.his.entity.HisUserSupplier" resultMap="supplierVisitAddressMap">
         SELECT DISTINCT
         his_user_supplier.supplier_id,
@@ -89,8 +46,6 @@
             <if test="query.bizRegionFourthly != null and query.bizRegionFourthly != ''"> and `his_user_supplier`.`biz_region_fourthly` = #{query.bizRegionFourthly}</if>
             <if test="query.tenantId != null and query.tenantId != ''"> and `his_user_supplier`.`tenant_id` = #{query.tenantId}</if>
             <if test="query.costFlag != null"> and `his_user_supplier`.`cost_flag` = #{query.costFlag}</if>
-
-
             <if test="query.queryAddress != null and query.queryAddress != ''"> and `bms_supplier_visit_address`.`address_detail` like concat('%',#{query.queryAddress},'%') </if>
             <if test="query.queryValue != null and query.queryValue != ''">
                 and (`bms_supplier_visit_address`.`address_detail` like concat('%',#{query.queryValue},'%')