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

src/main/java/cn/wisenergy/chnmuseum/party/service/impl/TBoardStatisticServiceImpl.java

@@ -99,7 +99,8 @@ public class TBoardStatisticServiceImpl extends ServiceImpl<TBoardStatisticMappe
 
     @Override
     public Page<TDistrictBoardStatistic> getBoardDistrictPageList(Page<TDistrictBoardStatistic> page, TDistrictBoardStatistic district){
-        page.setRecords(boardStatisticMapper.getBoardDistrictPageList(page,district));
+        List<TDistrictBoardStatistic> list = boardStatisticMapper.getBoardDistrictPageList(page, district);
+       page.setRecords(list);
         return page;
     }
 
@@ -128,6 +129,8 @@ public class TBoardStatisticServiceImpl extends ServiceImpl<TBoardStatisticMappe
         QueryWrapper qw = new QueryWrapper();
         qw.eq("type","P");
         List<TArea> provlist = areaService.list(qw);
+        provlist.stream().forEach(l->l.setName(l.getName().replace("省","").replace("市","").
+                replace("自治区","").replace("特别行政区","").replace("壮族","").replace("回族","").replace("维吾尔","")));
         // 遍历省份，统计各省播放量
         TBoardSurvey survey = new TBoardSurvey();
         String dateStr = DateUtil.getCurrentDate("yyyyMM");

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

@@ -114,9 +114,10 @@ public class AuditController extends BaseController {
             if (AuditTypeEnum.ACCOUNT.name().equals(audit.getType())) {
                 //设置用户原始数据状态
                 TUser user = userService.getById(audit.getRefItemId());
+                //无论初审复审，及时更新审核状态
                 user.setAuditStatus(audit.getStatus());
                 //如果复审通过，真正禁用用户
-                if (AuditStatusEnum.APPROVED_FINAL.name().equals(audit.getStatus())) {
+                if (AuditStatusEnum.APPROVED_FINAL.name().equals(audit.getStatus())&&AuditStatusEnum.TBC.name().equals(audit.getLevel())) {
                     user.setStatus(AuditOperationEnum.DISABLE.name());
                 }
                 userService.updateById(user);