Merge branch 'master_activity' into base-modify

1a64f4fc · hezhen · da25c78d · e3be2ffa · 1a64f4fc
Commit 1a64f4fc authored Oct 11, 2019 by hezhen
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

ActivityBmBiz.java ...main/java/com/xxfc/platform/summit/biz/ActivityBmBiz.java +1 -1

No files found.
--- a/xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/biz/ActivityBmBiz.java
+++ b/xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/biz/ActivityBmBiz.java
@@ -298,7 +298,7 @@ public class ActivityBmBiz extends BaseBiz<ActivityBmMapper, ActivityBm> {
            obj.put("parentId",user.getId());
            obj.put("name",user.getNickName());
        }
-        if (parentId!=null||parentId>=0){
+        if (parentId!=null&&parentId>0){
            user=userBiz.selectById(parentId);
            if (user!=null){
                obj.put("name",user.getNickName());