魏超 5 лет назад
Родитель
Сommit
4e3a8cb28b

+ 1
- 0
src/main/java/com/huiju/estateagents/controller/HelpActivityController.java Просмотреть файл

@@ -202,6 +202,7 @@ public class HelpActivityController extends BaseController {
202 202
         HelpActivity helpActivity = JSONObject.parseObject(parameter, HelpActivity.class);
203 203
         QueryWrapper<HelpActivity> helpActivityQueryWrapper = new QueryWrapper<>();
204 204
         helpActivityQueryWrapper.eq("heavy", helpActivity.getHeavy());
205
+        helpActivityQueryWrapper.ne("help_activity_id", helpActivity.getHelpActivityId());
205 206
         Integer heavyCount = taHelpActivityService.count(helpActivityQueryWrapper);
206 207
         if (heavyCount != 0){
207 208
             responseBean.addError("权重已存在,请重新编辑");

+ 2
- 2
src/main/java/com/huiju/estateagents/controller/TaBuildingDynamicController.java Просмотреть файл

@@ -423,7 +423,7 @@ public class TaBuildingDynamicController extends BaseController {
423 423
         dynamic.setPublishDate(LocalDateTime.now());
424 424
         dynamic.setCreateDate(LocalDateTime.now());
425 425
 
426
-        Integer heavyCount = iTaBuildingService.countNumByHeavy(dynamic.getHeavy());
426
+        Integer heavyCount = iTaBuildingService.countNumByHeavy(dynamic.getHeavy(), dynamic.getDynamicId());
427 427
         if (heavyCount != 0){
428 428
             responseBean.addError("权重已存在,请重新编辑");
429 429
             return responseBean;
@@ -459,7 +459,7 @@ public class TaBuildingDynamicController extends BaseController {
459 459
         if (dynamic.getEnlistEnd() != null && LocalDateTime.now().isAfter(dynamic.getEnlistEnd())){
460 460
             dynamic.setActivityStatus(2);
461 461
         }
462
-        Integer heavyCount = iTaBuildingService.countNumByHeavy(dynamic.getHeavy());
462
+        Integer heavyCount = iTaBuildingService.countNumByHeavy(dynamic.getHeavy(), dynamic.getDynamicId());
463 463
         if (heavyCount != 0){
464 464
             responseBean.addError("权重已存在,请重新编辑");
465 465
             return responseBean;

+ 1
- 0
src/main/java/com/huiju/estateagents/controller/TaShareActivityController.java Просмотреть файл

@@ -198,6 +198,7 @@ public class TaShareActivityController extends BaseController {
198 198
 
199 199
             QueryWrapper<TaShareActivity> taShareActivityQueryWrapper = new QueryWrapper<>();
200 200
             taShareActivityQueryWrapper.eq("heavy", taShareActivity.getHeavy());
201
+            taShareActivityQueryWrapper.ne("group_activity_id", taShareActivity.getGroupActivityId());
201 202
             Integer heavyCount = iTaShareActivityService.count(taShareActivityQueryWrapper);
202 203
             if (heavyCount != 0){
203 204
                 responseBean.addError("权重已存在,请重新编辑");

+ 1
- 1
src/main/java/com/huiju/estateagents/mapper/TaBuildingMapper.java Просмотреть файл

@@ -90,5 +90,5 @@ public interface TaBuildingMapper extends BaseMapper<TaBuilding> {
90 90
      * 根据权重统计该权重是否存在
91 91
      * @return
92 92
      */
93
-    int countNumByHeavy(@Param("heavy") Integer heavy);
93
+    int countNumByHeavy(@Param("heavy") Integer heavy, @Param("dynamicId") String dynamicId);
94 94
 }

+ 1
- 1
src/main/java/com/huiju/estateagents/service/ITaBuildingService.java Просмотреть файл

@@ -165,5 +165,5 @@ public interface ITaBuildingService extends IService<TaBuilding> {
165 165
      * @param heavy
166 166
      * @return
167 167
      */
168
-    int countNumByHeavy(Integer heavy);
168
+    int countNumByHeavy(Integer heavy, String dynamicId);
169 169
 }

+ 2
- 2
src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java Просмотреть файл

@@ -786,8 +786,8 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
786 786
     }
787 787
 
788 788
     @Override
789
-    public int countNumByHeavy(Integer heavy) {
790
-        return taBuildingMapper.countNumByHeavy(heavy);
789
+    public int countNumByHeavy(Integer heavy, String dynamicId) {
790
+        return taBuildingMapper.countNumByHeavy(heavy, dynamicId);
791 791
     }
792 792
 
793 793
 

+ 1
- 1
src/main/resources/mapper/TaBuildingMapper.xml Просмотреть файл

@@ -201,7 +201,7 @@
201 201
     </select>
202 202
 
203 203
     <select id="countNumByHeavy" resultType="java.lang.Integer">
204
-      select COUNT(1) from ta_building_dynamic t where t.heavy = #{heavy}
204
+      select COUNT(1) from ta_building_dynamic t where t.heavy = #{heavy} and t.dynamic_id != #{dynamicId}
205 205
     </select>
206 206
 
207 207
 </mapper>