Merge remote-tracking branch 'origin/zx_1026_1111' into zx_1026_1111

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SporadicChargeInfoImpl.java

@@ -200,16 +200,16 @@ public class SporadicChargeInfoImpl extends BaseServiceImpl<Integer, SporadicCha
             Map<Integer, String> operatorNames = MapUtil.convertMybatisMap(teacherDao.queryNameByIds(StringUtils.join(operatorIds, ",")));
             Map<Integer, String> userNames = MapUtil.convertMybatisMap(teacherDao.queryUsernameByIds(userIds));
             rows.forEach(e -> {
+                StringBuffer sb = new StringBuffer();
                 for (String organId : e.getOrganId().split(",")) {
-                    StringBuffer sb = new StringBuffer();
                     if (organNames.containsKey(Integer.parseInt(organId))) {
                         if(sb.length() > 0){
                             sb.append(",");
                         }
                         sb.append(organNames.get(Integer.parseInt(organId)));
                     }
-                    e.setOrganName(sb.toString());
                 }
+                e.setOrganName(sb.toString());
                 if (e.getUserId() != null) {
                     e.setUserName(userNames.get(e.getUserId()));
                 }