暂时提交

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinCheckUserMapper.xml

@@ -13,7 +13,7 @@
         <result column="name" property="name"/>
         <result column="mobile" property="mobile"/>
         <result column="status" property="status"/>
-    </resultMap>
+    </resultMap>childSimpleList
 
     <select id="childSimpleList" parameterType="java.lang.String" resultMap="simpleList">
         SELECT
@@ -22,7 +22,7 @@
         mobile
         FROM kylin_check_user
         <where>
-            merchant_id=#{merchantId}
+            merchant_id=#{merchantId} AND stauts = 1
             <if test="mobile !=null and mobile !='' ">
                 AND `mobile` LIKE concat('%', #{mobile}, '%')
             </if>

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/partner/KylinCheckUserPartnerServiceImpl.java

@@ -114,7 +114,7 @@ public class KylinCheckUserPartnerServiceImpl extends ServiceImpl<KylinCheckUser
         try {
             KylinCheckUser checkUser = new KylinCheckUser();
             checkUser.setName(name);
-            if(!pwd.isEmpty()) {
+            if(null!=pwd) {
                 checkUser.setPwd(DigestUtils.md5DigestAsHex(pwd.getBytes()));
             }
             checkUser.setMobile(mobile);