diff --git a/mallinkAdmin/src/main/resources/application-prod.yml b/mallinkAdmin/src/main/resources/application-prod.yml index bd0f1a701..0c0f5a5c1 100644 --- a/mallinkAdmin/src/main/resources/application-prod.yml +++ b/mallinkAdmin/src/main/resources/application-prod.yml @@ -33,6 +33,11 @@ spring: max-wait: -1 min-idle: 0 + +fileUpload: + path: /home/test/images + server: http://202.165.179.86:8081/images + logging: level: tk.mybatis: debug 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 f2f2eed11..99a2608f2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -205,7 +205,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { if (entity != null) { if (entity.getTagId() != null) { WxCUserTags uTag = wxCUserTagsMapper.selectByPrimaryKey(entity.getTagId()); - if (StringUtils.isNotBlank(uTag.getTags())) { + if (uTag != null && StringUtils.isNotBlank(uTag.getTags())) { List ids = JSONObject.parseArray(uTag.getTags(), Long.class); if (!ids.isEmpty()) { WxTags wxTagsQ = new WxTags();