顾绍勇 5 年 前
コミット
9db7128816

+ 5
- 5
src/main/java/com/huiju/estateagents/common/CommConstant.java ファイルの表示

@@ -36,27 +36,27 @@ public class CommConstant {
36 36
     /**
37 37
      * 状态: 正常
38 38
      */
39
-    public final static int STATUS_NORMAL = 1;
39
+    public final static Integer STATUS_NORMAL = 1;
40 40
 
41 41
     /**
42 42
      * 状态: 删除
43 43
      */
44
-    public final static int STATUS_DELETE = -1;
44
+    public final static Integer STATUS_DELETE = -1;
45 45
 
46 46
     /**
47 47
      * 状态: 关闭、禁用
48 48
      */
49
-    public final static int STATUS_CLOSED = 9;
49
+    public final static Integer STATUS_CLOSED = 9;
50 50
 
51 51
     /**
52 52
      * 消息未读
53 53
      */
54
-    public final static int MESSAGE_UNREAD = 0;
54
+    public final static Integer MESSAGE_UNREAD = 0;
55 55
 
56 56
     /**
57 57
      * 消息已读
58 58
      */
59
-    public final static int MESSAGE_READED = 1;
59
+    public final static Integer MESSAGE_READED = 1;
60 60
 
61 61
     /**
62 62
      * 点赞置业卡片

+ 9
- 3
src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java ファイルの表示

@@ -352,14 +352,20 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
352 352
             QueryWrapper<TaRaise> taRaiseQueryWrapper = new QueryWrapper<>();
353 353
             taRaiseQueryWrapper.eq("org_id", orgId);
354 354
             taRaiseQueryWrapper.eq("sales_batch_id", record.getSalesBatchId());
355
-            taRaiseQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
355
+            taRaiseQueryWrapper.eq("status", CommConstant.STATUS_NORMAL);
356 356
             TaRaise taRaise = iTaRaiseService.getOne(taRaiseQueryWrapper);
357
-            if (taRaise != null && null != taRaise.getInvite() && taRaise.getInvite() != CommConstant.STATUS_NORMAL) {
357
+            if (taRaise == null) {
358 358
                 resultSalesBatchList.add(record);
359 359
                 return;
360 360
             }
361 361
 
362
-            if(taRaise != null && null != taRaise.getInvite() &&  taRaise.getInvite() == CommConstant.STATUS_NORMAL){
362
+            // 未开启邀请制
363
+            if (CommConstant.STATUS_NORMAL != taRaise.getInvite()) {
364
+                resultSalesBatchList.add(record);
365
+                return;
366
+            }
367
+
368
+            if (CommConstant.STATUS_NORMAL == taRaise.getInvite()) {
363 369
                 // 若开启邀请制,校验该用户是否在邀请列表中
364 370
                 QueryWrapper<TaRaiseInvite> taRaiseInviteQueryWrapper = new QueryWrapper<>();
365 371
                 taRaiseInviteQueryWrapper.eq("org_id", orgId);