Merge branch 'master' of http://111.203.232.171:8888/lee/chnmuseum-party into master

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TBoardStatisticController.java

@@ -243,7 +243,7 @@ public class TBoardStatisticController extends BaseController {
             trend.setOrganCode(null);
         }
         // 如果查询日志为空，则默认当月
-        if (StringUtils.isEmpty(trend.getPlayDate())){
+        if (StringUtils.isEmpty(trend.getBeginDate())){
             trend.setBeginDate(DateUtil.getCurrentDate("yyyy")+"01");
             trend.setEndDate(DateUtil.getCurrentDate("yyyyMM"));
         }

src/main/resources/mapper/TBoxOperationMapper.xml

@@ -80,8 +80,8 @@
         <if test="tBoxOperation.areaName != null and tBoxOperation.areaName != '' ">
             and b.area_id LIKE concat(#{tBoxOperation.areaName}, '%')
         </if>
-        <if test="tBoxOperation.orgCode != null and tBoxOperation.orgCode != '' ">
-            and r.code LIKE concat(#{tBoxOperation.orgCode}, '%')
+        <if test="tBoxOperation.organCode != null and tBoxOperation.organCode != '' ">
+            and r.code LIKE concat(#{tBoxOperation.organCode}, '%')
         </if>
         order by b.create_time desc
     </select>