zoujiajian 1 年之前
父节点
当前提交
fe2638276f

+ 14 - 5
netflix-web/src/main/java/com/cyksj/web/controller/manage/exchange/ExchangeCodeController.java

@@ -21,13 +21,16 @@ import com.cyksj.model.excel.ExcelExchangeCodeData;
 import com.cyksj.model.request.ExchangeCodeReq;
 import com.cyksj.model.views.ExchangeCodeView;
 import com.cyksj.service.exchange.ExchangeCodeService;
+import com.cyksj.service.mange.cms.service.CmsUserService;
 import com.cyksj.web.util.EasyExcelUtils;
 import com.ejlchina.searcher.BeanSearcher;
 import com.ejlchina.searcher.SearchResult;
 import com.ejlchina.searcher.util.MapBuilder;
 import com.ejlchina.searcher.util.MapUtils;
 import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -57,6 +60,8 @@ public class ExchangeCodeController {
 
 	private final OrderDonMapper orderDonMapper;
 
+	private final CmsUserService cmsUserService;
+
 	/**
 	 * 生成兑换码 并导出
 	 */
@@ -92,8 +97,10 @@ public class ExchangeCodeController {
 		if (StrUtil.isNotEmpty(condition)) {
 			builder.put("condition", condition);
 		}
-		CmsUser cmsUser = cmsUserMapper.selectById(adminId);
-		builder.field(ExchangeCodeView::getOperator, cmsUser.getNickname());
+		if (!cmsUserService.isRootRole(adminId)) {
+			CmsUser cmsUser = cmsUserMapper.selectById(adminId);
+			builder.field(ExchangeCodeView::getOperator, cmsUser.getNickname());
+		}
 		SearchResult<ExchangeCodeView> search = beanSearcher.search(ExchangeCodeView.class, builder.build());
 		search.getDataList().forEach(data -> {
 			try {
@@ -128,8 +135,10 @@ public class ExchangeCodeController {
 		if (StrUtil.isNotEmpty(condition)) {
 			builder.put("condition", condition);
 		}
-		CmsUser cmsUser = cmsUserMapper.selectById(adminId);
-		builder.field(ExcelExchangeCodeData::getOperator, cmsUser.getNickname());
+		if (!cmsUserService.isRootRole(adminId)) {
+			CmsUser cmsUser = cmsUserMapper.selectById(adminId);
+			builder.field(ExchangeCodeView::getOperator, cmsUser.getNickname());
+		}
 		List<ExcelExchangeCodeData> data = beanSearcher.searchAll(ExcelExchangeCodeData.class, builder.build());
 		EasyExcelUtils.createExcelStreamMutilByEasyExcel(response, ExcelExchangeCodeData.class, data, "银河兑换码", "银河兑换码", ExcelTypeEnum.XLSX, null);
 	}