学校修改

blade-service/blade-client/src/main/java/org/springblade/client/school/controller/SchoolTeacherController.java

@@ -129,9 +129,9 @@ public class SchoolTeacherController extends BladeController {
 		if (StringUtils.isBlank(schoolTeacher.getIdNumber())){
 			throw new SecurityException("身份证号不能为空");
 		}
-		/*if (StringUtils.isBlank(schoolTeacher.getCode())){
+		if (StringUtils.isBlank(schoolTeacher.getCode())){
 			throw new SecurityException("工号不能为空");
-		}*/
+		}
 		if (StringUtils.isBlank(schoolTeacher.getCname())){
 			throw new SecurityException("姓名不能为空");
 		}

blade-service/blade-client/src/main/java/org/springblade/client/school/service/impl/SchoolTeacherServiceImpl.java

@@ -86,6 +86,10 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
 				errMsg.append("第"+(i+2)+"行,身份证号码为空,");
 				continue;
 			}
+			if (StringUtils.isBlank(schoolTeacherExcel.getCode())){
+				errMsg.append("第"+(i+2)+"行,工号为空,");
+				continue;
+			}
 			if (StringUtils.isBlank(schoolTeacherExcel.getCname())){
 				errMsg.append("第"+(i+2)+"行,姓名为空,");
 				continue;

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/controller/OrderController.java

@@ -662,5 +662,21 @@ public class OrderController extends BladeController {
 		return R.success("操作成功");
 	}
 
+	/**
+	 * 国内销售或采购订单表
+	 */
+	@GetMapping("/ListMessage")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "分页", notes = "传入order")
+	public R<IPage<Order>> ListMessage(Order order, Query query) {
+		order.setIsDeleted(0);
+		order.setTenantId(SecureUtil.getTenantId());
+		order.setBillType(OrderTypeEnum.SALES.getType());
+		order.setTradeType(OrderTypeEnum.DOMESTIC.getType());
+
+		IPage<Order> pages = orderService.page(Condition.getPage(query), Condition.getQueryWrapper(order));
+		return R.data(pages);
+	}
+
 
 }

blade-service/blade-school/src/main/java/org/springblade/school/service/impl/SalaryItemServiceImpl.java

@@ -58,7 +58,7 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 		for(int i=0;i<data.size();i++)
 		{
 			SalaryItemExcel salaryItemExcel = data.get(i);
-			if (StringUtils.isBlank(salaryItemExcel.getIdNumber())){
+			/*if (StringUtils.isBlank(salaryItemExcel.getIdNumber())){
 				errMsg.append("第"+(i+2)+"行,身份证号码为空,");
 				continue;
 			}
@@ -69,7 +69,7 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 			if (StringUtils.isBlank(salaryItemExcel.getRankStandard())){
 				errMsg.append("第"+(i+2)+"行,职级标准为空,");
 				continue;
-			}
+			}*/
 			SalaryItem salaryItem = new SalaryItem();
 			BeanUtil.copy(salaryItemExcel,salaryItem);
 			//根据身份证号查询教职工信息是否存在存在更新不存在新增