Explorar el Código

Merge branch 'release_real_202010' of https://git.malls.iformall.com/server/formallProject into release_real_202010

release_toaliyun_real
xhxu hace 5 años
padre
commit
206802c898
Se han modificado 2 ficheros con 8 adiciones y 2 borrados
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java
  2. +7
    -1
      mybatis-multi-tenancy/src/main/java/com/iformall/plugin/shard/plugin/ShardingSpherePlugin.java

+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java Ver fichero

@@ -385,7 +385,7 @@ public class WxCouponSendServiceImpl implements WxCouponSendService {
bRet = true;
}
} catch (Exception e) {
logger.error(e.getMessage());
logger.error(e.getMessage(),e);
}




+ 7
- 1
mybatis-multi-tenancy/src/main/java/com/iformall/plugin/shard/plugin/ShardingSpherePlugin.java Ver fichero

@@ -178,7 +178,10 @@ public class ShardingSpherePlugin implements MyBatisPlus {
private Object getValue(String column,Object parameterObject,Map<String,Object> parentChainMap) {
if (null != parentChainMap && parentChainMap.containsKey(column)) {
return parentChainMap.get(column);
Object o = parentChainMap.get(column);
if (null != o) {
return o;
}
}
if (parameterObject instanceof Map) {
@@ -216,6 +219,9 @@ public class ShardingSpherePlugin implements MyBatisPlus {
}
private String getField(String column) {
if (null == column) {
throw new RuntimeException("table sharinding error column is null");
}
String[] field = column.split("_");
String fieldName = "";
if (null != field && field.length > 0) {


Cargando…
Cancelar
Guardar