Merge branch 'wei_master' into '105'

update

See merge request !22

src/main/java/com/server/web/common/service/Impl/InformationServiceImpl.java

 package com.server.web.common.service.Impl;
 
+import com.server.web.common.mapper.TBaseFirstClassMapper;
 import com.server.web.common.mapper.TBaseSecondClassMapper;
 import com.server.web.common.mapper.TKzyCommentMapper;
 import com.server.web.common.mapper.TKzyInformationMapper;
 import com.server.web.common.mapping.CommentMapper;
 import com.server.web.common.mapping.InformationMapper;
-import com.server.web.common.model.TBaseSecondClass;
-import com.server.web.common.model.TBaseSecondClassExample;
-import com.server.web.common.model.TKzyComment;
-import com.server.web.common.model.TKzyInformation;
+import com.server.web.common.model.*;
 import com.server.web.common.service.InformationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -35,12 +33,18 @@ public class InformationServiceImpl implements InformationService {
     private CommentMapper commentMapper;
     @Autowired
     private TKzyCommentMapper tKzyCommentMapper;
+    @Autowired
+    private TBaseFirstClassMapper tBaseFirstClassMapper;
 
     @Override
     public Map<String, Object> secondClassList(Long firstId) {
         TBaseSecondClassExample tBaseSecondClassExample = new TBaseSecondClassExample();
         tBaseSecondClassExample.createCriteria().andFirstIdEqualTo(firstId).andStatusEqualTo(1);
         List<TBaseSecondClass> list = tBaseSecondClassMapper.selectByExample(tBaseSecondClassExample);
+        TBaseFirstClass tBaseFirstClass = tBaseFirstClassMapper.selectByPrimaryKey(firstId);
+        Map<String, Object> dataMap = new HashMap<String, Object>();
+        dataMap.put("list", list);
+        dataMap.put("firstClassName", tBaseFirstClass.getClassName());
         return returnMap("1", "", list);
     }