Browse Source

* 代码优化

顾绍勇 5 years ago
parent
commit
7a67df34e4

+ 1
- 1
src/main/java/com/huiju/estateagents/sample/controller/TaNoticeController.java View File

@@ -148,7 +148,7 @@ public class TaNoticeController extends BaseController {
148 148
                 return responseBean;
149 149
             }
150 150
             if (taNotice.getTargetId() != null) {
151
-                TaH5Sample taH5Sample = iTaH5SampleService.getById(taNotice.getNoticeId());
151
+                TaH5Sample taH5Sample = iTaH5SampleService.getById(taNotice.getTargetId());
152 152
                 if (taH5Sample != null) {
153 153
                     taNotice.setTargetName(taH5Sample.getSampleName());
154 154
                 }

+ 14
- 0
src/main/java/com/huiju/estateagents/service/impl/TaHousingResourcesServiceImpl.java View File

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
5 5
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6 6
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
7 7
 import com.huiju.estateagents.base.ResponseBean;
8
+import com.huiju.estateagents.center.taUser.entity.TaUser;
9
+import com.huiju.estateagents.center.taUser.service.impl.TaUserServiceImpl;
8 10
 import com.huiju.estateagents.common.CommConstant;
9 11
 import com.huiju.estateagents.common.StringUtils;
10 12
 import com.huiju.estateagents.entity.*;
@@ -97,6 +99,9 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
97 99
     @Autowired
98 100
     private TaRaiseRecordMapper taRaiseRecordMapper;
99 101
 
102
+    @Autowired
103
+    private TaUserServiceImpl taUserService;
104
+
100 105
     /**
101 106
      * 分页获取房源列表
102 107
      *
@@ -671,6 +676,7 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
671 676
         taRaiseRecordQueryWrapper.eq("raise_record_id", raiseRecordId);
672 677
         TaRaiseRecord raiseRecord = taRaiseRecordMapper.selectOne(taRaiseRecordQueryWrapper);
673 678
 
679
+        TaUser taUser = taUserService.getUserInfoById(userId, orgId);
674 680
         // 更新为锁定状态
675 681
         if ("locked".equals(type)) {
676 682
             // 校验当前房源状态
@@ -692,6 +698,10 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
692 698
             TaRaiseRecord taRaiseRecord = new TaRaiseRecord();
693 699
             taRaiseRecord.setRaiseRecordId(raiseRecordId);
694 700
             taRaiseRecord.setHouseLockingStatus("locked");
701
+            if(taUser != null){
702
+                taRaiseRecord.setUpdateUserName(taUser.getUserName());
703
+            }
704
+            taRaiseRecord.setUpdateDate(LocalDateTime.now());
695 705
             taRaiseRecordMapper.updateById(taRaiseRecord);
696 706
 
697 707
             // 更新关联表状态
@@ -723,6 +733,10 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
723 733
             TaRaiseRecord taRaiseRecord = new TaRaiseRecord();
724 734
             taRaiseRecord.setRaiseRecordId(raiseRecordId);
725 735
             taRaiseRecord.setHouseLockingStatus("unlocked");
736
+            if(taUser != null){
737
+                taRaiseRecord.setUpdateUserName(taUser.getUserName());
738
+            }
739
+            taRaiseRecord.setUpdateDate(LocalDateTime.now());
726 740
             taRaiseRecordMapper.updateById(taRaiseRecord);
727 741
 
728 742
             // 更新关联表状态