Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ClassGroup.java

@@ -44,6 +44,10 @@ public class ClassGroup {
 	@ApiModelProperty(value = "群名称", required = true)
 	private String groupName;
 
+	/** 群名称 */
+	@ApiModelProperty(value = "群名称", required = true)
+	private String viewGroupName;
+
 	/** 乐团名称 */
 	@ApiModelProperty(value = "乐团名称", required = true)
 	private String musicGroupName;
@@ -83,6 +87,14 @@ public class ClassGroup {
 	@ApiModelProperty(value = "班级图标",required = false)
 	private String img;
 
+	public String getViewGroupName() {
+		return viewGroupName;
+	}
+
+	public void setViewGroupName(String viewGroupName) {
+		this.viewGroupName = viewGroupName;
+	}
+
 	public String getMusicGroupName() {
 		return musicGroupName;
 	}

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

@@ -2615,12 +2615,15 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     public ClassGroup findGroupById(Integer groupId) {
         ClassGroup classGroup = classGroupDao.get(groupId);
         if(classGroup != null){
+            classGroup.setViewGroupName(classGroup.getName());
             if(classGroup.getGroupType() == GroupType.MUSIC){
                 MusicGroup musicGroup = musicGroupDao.get(classGroup.getMusicGroupId());
                 if(musicGroup != null){
                     classGroup.setMusicGroupName(musicGroup.getName());
                     classGroup.setName(musicGroup.getName() + " " + (StringUtils.isEmpty(classGroup.getGroupName())?classGroup.getName():classGroup.getGroupName()));
                 }
+            }else {
+                classGroup.setName(StringUtils.isEmpty(classGroup.getGroupName())?classGroup.getName():classGroup.getGroupName());
             }
         }
         return classGroup;

mec-biz/src/main/resources/config/mybatis/TenantPaymentOrderMapper.xml

@@ -50,7 +50,7 @@
             <if test="userId != null">
                 AND tpo.user_id_ = #{userId}
             </if>
-            <if test="phone != null">
+            <if test="phone != null and phone != ''">
                 AND su.phone_ = #{phone}
             </if>
             <if test="paymentChannel != null">

mec-student/src/main/java/com/ym/mec/student/controller/SysConfigController.java

@@ -1,22 +1,19 @@
 package com.ym.mec.student.controller;
 
-import com.ym.mec.common.filters.TenantIdThreadLocal;
+import com.ym.mec.biz.dal.entity.SysConfig;
+import com.ym.mec.biz.service.SysConfigService;
+import com.ym.mec.common.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.ym.mec.biz.dal.entity.SysConfig;
-import com.ym.mec.biz.service.SysConfigService;
-import com.ym.mec.common.controller.BaseController;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /** 
  * 系统配置控制层
@@ -32,7 +29,6 @@ public class SysConfigController extends BaseController {
 	@ApiOperation(value = "参数列表")
 	@GetMapping(value = "list")
 	public Object configList(String group) {
-		Integer integer = TenantIdThreadLocal.get();
 		Map<String,Object> params = new HashMap<String, Object>();
 		params.put("group", group);
 		List<SysConfig> configs = sysConfigService.findAll(params);

mec-student/src/main/java/com/ym/mec/student/interceptor/MDCInterceptor.java

@@ -50,5 +50,6 @@ public class MDCInterceptor extends HandlerInterceptorAdapter {
 	public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
 		MDC.remove(USERNAME);
 		MDC.remove(IP);
+		TenantIdThreadLocal.remove();
 	}
 }

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherSubjectController.java

@@ -44,7 +44,6 @@ public class TeacherSubjectController extends BaseController {
     public Object findSubSubjects(Integer tenantId){
         if(tenantId == null){
             tenantId = TenantIdThreadLocal.get();
-            TenantIdThreadLocal.remove();
         }
         return succeed(subjectService.findSubSubjects(tenantId));
     }

mec-teacher/src/main/java/com/ym/mec/teacher/interceptor/MDCInterceptor.java

@@ -37,4 +37,9 @@ public class MDCInterceptor extends HandlerInterceptorAdapter {
 		}
 		return true;
 	}
+
+	@Override
+	public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
+		TenantIdThreadLocal.remove();
+	}
 }

mec-web/src/main/java/com/ym/mec/web/controller/ExportController.java

@@ -126,15 +126,14 @@ public class ExportController extends BaseController {
         }
         List<TenantPaymentOrder> paymentOrders = tenantPaymentOrderService.queryPage(queryInfo).getRows();
         try {
-            HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"交易流水号", "订单号", "订单日期", "交易类型", "应付金额",
-                    "实付金额", "用户姓名", "交易方式", "收款账户", "交易状态", "备注", "交易方式"}, new String[]{
-                    "transNo", "orderNo", "createTime", "type.desc", "expectAmount",
-                    "actualAmount", "username", "paymentChannel", "merNos", "status.msg", "memo", "paymentChannel.desc"}, paymentOrders);
-            response.setContentType("application/octet-stream");
-            response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
-            workbook.write(response.getOutputStream());
-            workbook.close();
+			HSSFWorkbook workbook = POIUtil.exportExcel(new String[] { "交易流水号", "订单号", "订单日期", "交易类型", "应付金额", "实付金额", "用户姓名", "手机号码", "交易方式", "收款账户", "交易状态",
+					"备注", "交易方式" }, new String[] { "transNo", "orderNo", "createTime", "type.desc", "expectAmount", "actualAmount", "user.username",
+					"user.phone", "paymentChannel", "merNos", "status.msg", "memo", "paymentChannel.desc" }, paymentOrders);
+			response.setContentType("application/octet-stream");
+			response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
+			response.flushBuffer();
+			workbook.write(response.getOutputStream());
+			workbook.close();
         } catch (Exception e) {
             e.printStackTrace();
         }