测试bug修改

knowledge-base/src/main/java/com/mortals/xhx/module/site/service/impl/SiteMatterAssistServiceImpl.java

@@ -59,7 +59,7 @@ public class SiteMatterAssistServiceImpl extends AbstractCRUDServiceImpl<SiteMat
                 matterMap.put(0l,0l);
             }
             list.stream().peek(item->{
-                if(matterMap.containsKey(item.getMatterId())){
+                if(matterMap.containsKey(item.getId())){
                     item.setIsCollect(1);
                 }
             }).count();
@@ -89,7 +89,7 @@ public class SiteMatterAssistServiceImpl extends AbstractCRUDServiceImpl<SiteMat
                 matterMap.put(0l,0l);
             }
             list.stream().peek(item->{
-                if(matterMap.containsKey(item.getMatterId())){
+                if(matterMap.containsKey(item.getId())){
                     item.setIsCollect(1);
                 }
             }).count();

knowledge-base/src/main/java/com/mortals/xhx/module/user/model/vo/UserCollectVo.java

@@ -22,4 +22,6 @@ public class UserCollectVo extends BaseEntityLong {
     private Integer datumCount = 0;
     /** 浏览次数 */
     private Long viewsCount = 0l;
+
+    private Long assistId;
 }
\ No newline at end of file

knowledge-base/src/main/java/com/mortals/xhx/module/user/service/impl/UserCollectServiceImpl.java

@@ -6,8 +6,11 @@ import com.mortals.xhx.module.matter.model.MatterDatumQuery;
 import com.mortals.xhx.module.matter.model.MatterEntity;
 import com.mortals.xhx.module.matter.service.MatterDatumService;
 import com.mortals.xhx.module.matter.service.MatterService;
+import com.mortals.xhx.module.site.model.SiteMatterAssistEntity;
+import com.mortals.xhx.module.site.model.SiteMatterAssistQuery;
 import com.mortals.xhx.module.site.model.SiteMatterEntity;
 import com.mortals.xhx.module.site.model.SiteMatterQuery;
+import com.mortals.xhx.module.site.service.SiteMatterAssistService;
 import com.mortals.xhx.module.site.service.SiteMatterService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,23 +37,25 @@ public class UserCollectServiceImpl extends AbstractCRUDServiceImpl<UserCollectD
     @Autowired
     private MatterDatumService matterDatumService;
     @Autowired
-    private SiteMatterService siteMatterService;
+    private SiteMatterAssistService siteMatterAssistService;
 
     @Override
     protected void findAfter(UserCollectEntity params, PageInfo pageInfo, Context context, List<UserCollectEntity> list) throws AppException {
         for(UserCollectEntity entity:list){
             if(entity.getCollectType()==1) {
-                Long matterId = DataUtil.converStr2Long(entity.getBusinessId(), 0l);
-                SiteMatterEntity siteMatterEntity = siteMatterService.selectOne(new SiteMatterQuery().matterId(matterId));
+                Long assistId = DataUtil.converStr2Long(entity.getBusinessId(), 0l);
+                SiteMatterAssistEntity siteMatterEntity = siteMatterAssistService.get(assistId);
                 if(siteMatterEntity!=null){
                     entity.setViewsCount(siteMatterEntity.getViewsCount());
+                    entity.setMatterId(siteMatterEntity.getMatterId());
+                    List<MatterDatumEntity> matterDatumFileEntities = matterDatumService.find(new MatterDatumQuery().matterId(siteMatterEntity.getMatterId()));
+                    if(CollectionUtils.isNotEmpty(matterDatumFileEntities)) {
+                        entity.setDatumCount(matterDatumFileEntities.size());
+                    }else {
+                        entity.setDatumCount(0);
+                    }
                 }
-                List<MatterDatumEntity> matterDatumFileEntities = matterDatumService.find(new MatterDatumQuery().matterId(matterId));
-                if(CollectionUtils.isNotEmpty(matterDatumFileEntities)) {
-                    entity.setDatumCount(matterDatumFileEntities.size());
-                }else {
-                    entity.setDatumCount(0);
-                }
+
             }
         }
     }
@@ -59,17 +64,19 @@ public class UserCollectServiceImpl extends AbstractCRUDServiceImpl<UserCollectD
     protected void findAfter(UserCollectEntity params, Context context, List<UserCollectEntity> list) throws AppException {
         for(UserCollectEntity entity:list){
             if(entity.getCollectType()==1) {
-                Long matterId = DataUtil.converStr2Long(entity.getBusinessId(), 0l);
-                SiteMatterEntity siteMatterEntity = siteMatterService.selectOne(new SiteMatterQuery().matterId(matterId));
+                Long assistId = DataUtil.converStr2Long(entity.getBusinessId(), 0l);
+                SiteMatterAssistEntity siteMatterEntity = siteMatterAssistService.get(assistId);
                 if(siteMatterEntity!=null){
                     entity.setViewsCount(siteMatterEntity.getViewsCount());
+                    entity.setMatterId(siteMatterEntity.getMatterId());
+                    List<MatterDatumEntity> matterDatumFileEntities = matterDatumService.find(new MatterDatumQuery().matterId(siteMatterEntity.getMatterId()));
+                    if(CollectionUtils.isNotEmpty(matterDatumFileEntities)) {
+                        entity.setDatumCount(matterDatumFileEntities.size());
+                    }else {
+                        entity.setDatumCount(0);
+                    }
                 }
-                List<MatterDatumEntity> matterDatumFileEntities = matterDatumService.find(new MatterDatumQuery().matterId(matterId));
-                if(CollectionUtils.isNotEmpty(matterDatumFileEntities)) {
-                    entity.setDatumCount(matterDatumFileEntities.size());
-                }else {
-                    entity.setDatumCount(0);
-                }
+
             }
         }
     }

knowledge-base/src/main/java/com/mortals/xhx/module/user/web/UserCollectController.java

@@ -62,7 +62,7 @@ public class UserCollectController extends BaseCRUDJsonBodyMappingController<Use
         try {
             UserCollectEntity remove = new UserCollectEntity();
             remove.setUserId(user.getId());
-            remove.setBusinessId(entity.getMatterId()+"");
+            remove.setBusinessId(entity.getAssistId()+"");
             UserCollectEntity delete = service.selectOne(remove);
             if(delete!=null) {
                 this.service.remove(delete.getId(), context);