纪新园 11 місяців тому
батько
коміт
3bb3b4ee8e

+ 0 - 7
blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/excel/PjOrderExportExcelXS.java

@@ -133,13 +133,6 @@ public class PjOrderExportExcelXS implements Serializable {
 	private Integer actualPaymentStatus;
 
 	/**
-	 * 应结日期
-	 */
-	@ExcelProperty(value = "应结日期")
-	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-	@DateTimeFormat(pattern = "yyyy-MM-dd")
-	private Date dueDate;
-	/**
 	 * 业务日期
 	 */
 	@ExcelProperty(value = "业务日期")

+ 1 - 1
blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/controller/OrderController.java

@@ -344,7 +344,7 @@ public class OrderController extends BladeController {
 				user.append(item).append(",");
 			}
 			if (ObjectUtils.isNotNull(user.toString())) {
-				userList = iUserClient.selectUserList(user.substring(0, user.length() - 1));
+				userList = iUserClient.selectListNotTenantId(AuthUtil.getTenantId(),user.substring(0, user.length() - 1));
 			}
 			for (PjOrder item : pages) {
 				PjOrderExportExcelXS orderExportExcelXS = new PjOrderExportExcelXS();