Merge branch 'dev'

王言钊
2 parents 0b61abbe e9814279
Showing 1 changed file with 1 additions and 1 deletions
src/main/java/com/cnlive/shenhe/controller/VideosController.java
@@ -249,7 +249,7 @@ public class VideosController extends BaseController {
                 detailsContent.setSpid_desc(shySites.getName() + "(目击者)");
                 //如果source1不等于null；直接查询
                 for (ShyActivity activity : activityList) {
-                    if (activity.getId().equals(Integer.valueOf(source1))) {
+                    if (String.valueOf(activity.getId()).equals(source1)) {
                         detailsContent.setSpid_desc(activity.getActivity());
                         break;
                     }