Merge branch 'dev' of http://git.echepei.com/lazhaoqian/bladex into dev

blade-service/blade-client/src/main/java/org/springblade/client/corps/mapper/CorpsTypeMapper.xml

@@ -75,7 +75,10 @@
                 and dept.sort = #{corpsType.sort}
             </if>
             <if test="corpsType.remarks!=null and corpsType.remarks != ''">
-                and dept.remarks #{corpsType.remarks}
+                and dept.remarks = #{corpsType.remarks}
+            </if>
+            <if test="corpsType.tenantId!=null and corpsType.tenantId != ''">
+                and dept.tenant_id = #{corpsType.tenantId}
             </if>
             <if test="corpsType.version!=null and corpsType.version != ''">
                 and dept.version = #{corpsType.version}

blade-service/blade-client/src/main/java/org/springblade/client/serial/service/impl/SerialServiceImpl.java

@@ -43,7 +43,7 @@ public class SerialServiceImpl extends ServiceImpl<SerialMapper, Serial> impleme
 		return page.setRecords(baseMapper.selectSerialPage(page, serial));
 	}
 	@Override
-	public String getBillNo(String type) {
+	public synchronized String getBillNo(String type) {
 		Date date = new Date();
 		String billNo = null;
 		String yyyyMM = DateFormatUtils.format(date, "yyyyMM");

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderServiceImpl.java

@@ -85,12 +85,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		//保存订单主表信息
 		if (order.getId() == null){
 			//获取系统编号
-			R billNo = serialClient.getBillNo(order.getBillType());
+			/*R billNo = serialClient.getBillNo(order.getBillType());
 			if (billNo.getCode() != 200){
 				TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
 				return R.fail(500,"生成系统编号失败");
 			}
-			order.setSysNo((String) billNo.getData());
+			order.setSysNo((String) billNo.getData());*/
 			order.setTenantId(SecureUtil.getTenantId());
 			order.setCreateTime(date);
 			order.setCreateUser(SecureUtil.getUserId());