he2802 2 years ago
parent
commit
a98d544ac8

+ 6 - 0
zhongzheng-common/src/main/java/com/zhongzheng/common/utils/ToolsUtils.java

@@ -7,6 +7,7 @@ import com.aliyun.dysmsapi20170525.models.SendSmsResponse;
 import com.aliyun.teaopenapi.models.Config;
 import com.aliyun.teaopenapi.models.Config;
 import com.google.zxing.common.BitMatrix;
 import com.google.zxing.common.BitMatrix;
 import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.exception.CustomException;
 import io.micrometer.core.lang.NonNull;
 import io.micrometer.core.lang.NonNull;
 import net.sf.jsqlparser.expression.LongValue;
 import net.sf.jsqlparser.expression.LongValue;
 
 
@@ -347,6 +348,11 @@ public class ToolsUtils {
         if(!StrUtil.isNotBlank(TenantId)||TenantId==null){
         if(!StrUtil.isNotBlank(TenantId)||TenantId==null){
             TenantId = ServletUtils.getResponse().getHeader("TenantId");
             TenantId = ServletUtils.getResponse().getHeader("TenantId");
         }
         }
+        if(Validator.isNotEmpty(TenantId)){
+            if(TenantId.equals("undefined")){
+                throw new CustomException("企业ID错误");
+            }
+        }
         return TenantId;
         return TenantId;
     }
     }
 
 

+ 7 - 2
zhongzheng-system/src/main/resources/mapper/modules/distribution/DistributionSellerMapper.xml

@@ -57,9 +57,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="findList" parameterType="com.zhongzheng.modules.top.distribution.bo.DistributionSellerQuery" resultMap="DistributionSellerVoResult">
     <select id="findList" parameterType="com.zhongzheng.modules.top.distribution.bo.DistributionSellerQuery" resultMap="DistributionSellerVoResult">
         SELECT
         SELECT
-            s.*,
+            s.realname,
+            s.seller_id,
+            s.user_account,
+            s.share_code,
+            s.gzh_open_id,
             u.id_card,
             u.id_card,
-            u.phonenumber
+            u.phonenumber,
+            u.`status`
         FROM
         FROM
             distribution_seller s
             distribution_seller s
                 LEFT JOIN sys_user u ON s.seller_id = u.seller_id
                 LEFT JOIN sys_user u ON s.seller_id = u.seller_id