From 9dfce431112922678694fa92832060eea12bf305 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Fri, 23 Oct 2020 14:30:00 +0800 Subject: [PATCH] fix bug --- .../iformall/service/impl/WxCUserBasicInfoServiceImpl.java | 2 +- mybatis-multi-tenancy/pom.xml | 7 +++---- .../iformall/plugin/shard/plugin/ShardingSpherePlugin.java | 5 +++++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java index ed868ff15..4d9192d7c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -576,7 +576,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc WxCUserBasicInfo basicQ = new WxCUserBasicInfo(); basicQ.undateFinalTenantId(tenantEntity); basicQ.setPhone(phone); - List basicInfos = wxCUserBasicInfoMapper.selectList(new QueryWrapper(basicQ)); + List basicInfos = wxCUserBasicInfoMapper.selectList(new QueryWrapper(basicQ)); if (basicInfos != null && basicInfos.size() > 0) { WxCUserBasicInfo wxCUserBasicInfo = basicInfos.get(0); if (wxCUserBasicInfo.getPoins() != null) { diff --git a/mybatis-multi-tenancy/pom.xml b/mybatis-multi-tenancy/pom.xml index ee4a4ac01..d0f4b598f 100644 --- a/mybatis-multi-tenancy/pom.xml +++ b/mybatis-multi-tenancy/pom.xml @@ -14,10 +14,9 @@ compile - org.mybatis - mybatis - 3.5.4 - compile + com.baomidou + mybatis-plus-core + 3.2.0 diff --git a/mybatis-multi-tenancy/src/main/java/com/iformall/plugin/shard/plugin/ShardingSpherePlugin.java b/mybatis-multi-tenancy/src/main/java/com/iformall/plugin/shard/plugin/ShardingSpherePlugin.java index 1becdc1f2..0fdd10010 100644 --- a/mybatis-multi-tenancy/src/main/java/com/iformall/plugin/shard/plugin/ShardingSpherePlugin.java +++ b/mybatis-multi-tenancy/src/main/java/com/iformall/plugin/shard/plugin/ShardingSpherePlugin.java @@ -187,6 +187,11 @@ public class ShardingSpherePlugin implements MyBatisPlus { Object o = parameterObject; if (((Map) parameterObject).containsKey("et")) { o = ((Map) parameterObject).get("et"); + }else if(((Map) parameterObject).containsKey("ew")) { + Object ew = ((Map) parameterObject).get("ew"); + if (ew instanceof com.baomidou.mybatisplus.core.conditions.query.QueryWrapper) { + o = ((com.baomidou.mybatisplus.core.conditions.query.QueryWrapper) ew).getEntity(); + } }else if(((Map) parameterObject).containsKey(column)) { o = ((Map) parameterObject).get(column); }else if (((Map) parameterObject).containsKey(field)) {