2022年9月13日 17:50

blade-service/blade-client/src/main/java/org/springblade/client/port/controller/PortController.java

@@ -210,5 +210,12 @@ public class PortController {
 		return R.data(basicPortDescService.list(queryWrapper));
 	}
 
+	@GetMapping("/allList")
+	public R allList(BasicPortDesc basicPortDesc){
+		LambdaQueryWrapper<BasicPortDesc> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(BasicPortDesc::getIsDeleted, 0);
+		lambdaQueryWrapper.eq(BasicPortDesc::getTenantId, AuthUtil.getTenantId());
+		return R.data(basicPortDescService.list(lambdaQueryWrapper));
+	}
 
 }

blade-service/blade-client/src/main/java/org/springblade/client/serial/mapper/SerialMapper.xml

@@ -55,7 +55,7 @@
         </trim>
         where id = #{id}
     </update>
-    <insert id="insertSerialMessage" parameterType="org.springblade.client.entity.Serial" useGeneratedKeys="true" keyProperty="fId">
+    <insert id="insertSerialMessage" parameterType="org.springblade.client.entity.Serial" useGeneratedKeys="true">
         insert into basic_serial
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="billType != null">bill_type,</if>

blade-service/blade-land/src/main/java/org/springblade/land/service/impl/OrderItemServiceImpl.java

@@ -687,7 +687,9 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 		}
 		if (ObjectUtil.isNotEmpty(item.getDriverId())) {
 			LandDriver driver = landDriverClient.getDriver(item.getDriverId());
-			item.setDriverName(driver.getName());
+			if (ObjectUtil.isNotEmpty(driver)){
+				item.setDriverName(driver.getName());
+			}
 		}
 
 		if (tag == 0) {

blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java

@@ -105,7 +105,7 @@ public class UserController {
 
 	@GetMapping("/userList")
 	public R userList(UserVO userVO) {
-		if (AuthUtil.getTenantId().equals("234557") && !StringUtil.isNotBlank(userVO.getDeptPid()) && !"业务员".equals(userVO.getRoleAlias())){
+		if (AuthUtil.getTenantId().equals("234557") && !"业务员".equals(userVO.getRoleAlias())){
 			return R.data(new ArrayList<>());
 		}
 		LambdaQueryWrapper<User> lambdaQueryWrapper = new LambdaQueryWrapper<>();

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/service/impl/PurchaseServiceImpl.java

@@ -116,8 +116,8 @@ public class PurchaseServiceImpl extends ServiceImpl<OrderMapper, Order> impleme
 		//生成平台代理商订单
 		Order purchase = new Order();
 		purchase.setBelongToCorpId(corpsDesc.getId());//所属公司
-		purchase.setBillType(order.getBillType());//代理订单
-		purchase.setTradeType(order.getTradeType());//国内订单
+		purchase.setBillType(orderMessage.getBillType());//代理订单
+		purchase.setTradeType(orderMessage.getTradeType());//国内订单
 		purchase.setTenantId(tenant.getTerrace());//代理商对应的平台的租户id
 		purchase.setBusinesDate(new Date());//订单日期
 		//purchase.setCreateUser(SecureUtil.getUserId());
@@ -158,13 +158,13 @@ public class PurchaseServiceImpl extends ServiceImpl<OrderMapper, Order> impleme
 			purchase.setArrivalAddress(agentCode.getStorageAddr());//到货地址
 		}
 		//生成系统编号
-		R billNo = serialClient.getNo(purchase.getBillType(), purchase.getTradeType(), purchase.getBillType(),tenant.getTerrace());
+		R billNo = serialClient.getNo(purchase.getBillType(), purchase.getTradeType(), purchase.getBillType(),tenant.getTenantId());
 		if (billNo.getCode() != 200) {
 			throw new SecurityException("生成系统编号失败");
 		}
 		purchase.setSysNo((String) billNo.getData());//系统编号
 		//生成销售单号
-		R clientBillNo = serialClient.getNo(agentCode.getCode(), order.getTradeType(), order.getBillType(),tenant.getTerrace());
+		R clientBillNo = serialClient.getNo(agentCode.getCode(), order.getTradeType(), order.getBillType(),tenant.getTenantId());
 		if (!clientBillNo.isSuccess()) {
 			throw new SecurityException("生成系统编号失败");
 		}