Merge branch 'wei_master' into '105'

update

See merge request !33

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

@@ -80,6 +80,9 @@ public class InformationServiceImpl implements InformationService {
     @Override
     @Override
     public Map<String, Object> informationDetail(Long informationId) {
     public Map<String, Object> informationDetail(Long informationId) {
         TKzyInformation tKzyInformation = tKzyInformationMapper.selectByPrimaryKey(informationId);
         TKzyInformation tKzyInformation = tKzyInformationMapper.selectByPrimaryKey(informationId);
+        if (tKzyInformation == null) {
+            return returnMap("0", "未查到该数据信息!", null);
+        }
         tKzyInformation.getContent();
         tKzyInformation.getContent();
         Map<String, Object> dataMap = new HashMap<String, Object>();
         Map<String, Object> dataMap = new HashMap<String, Object>();
         dataMap.put("id", tKzyInformation.getId());
         dataMap.put("id", tKzyInformation.getId());