1.权限修改

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java

@@ -81,7 +81,7 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
 		List<DeptVO> tree = null;
 		if (!AuthUtil.getUserRole().contains("admin")) {
 			R<User> r = userClient.userInfoById(AuthUtil.getUserId());
-			if (r.isSuccess() && ObjectUtils.isNotNull(r.getData().getDeptPid())) {
+			if (r.isSuccess() && ObjectUtils.isNotNull(r.getData()) && ObjectUtils.isNotNull(r.getData().getDeptPid())) {
 				tree = baseMapper.tree(tenantId, Long.parseLong(r.getData().getDeptPid().split(",")[0]));
 			} else {
 				if (ObjectUtils.isNotNull(AuthUtil.getDeptId())) {

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/ParamServiceServiceImpl.java

@@ -2,6 +2,7 @@
 package org.springblade.system.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
@@ -47,7 +48,7 @@ public class ParamServiceServiceImpl extends ServiceImpl<ParamServiceMapper, Par
 	public String getValueNew(String paramKey) {
 		String deptId = AuthUtil.getDeptId();
 		R<User> r = userClient.userInfoById(AuthUtil.getUserId());
-		if (r.isSuccess()) {
+		if (r.isSuccess()&& ObjectUtils.isNotNull(r.getData()) && ObjectUtils.isNotNull(r.getData().getDeptPid())) {
 			String deptIds = r.getData().getDeptPid();
 			String[] arr = deptIds.split(",");
 			if (arr.length > 0) {

blade-service/gubersail-dealer-admin/src/main/java/com/gubersail/admin/corp/controller/CorpsTypeController.java

@@ -91,7 +91,9 @@ public class CorpsTypeController extends BladeController {
 	public R<IPage<CorpsTypeVO>> page(CorpsTypeVO corpsType, Query query) {
 		corpsType.setIsDeleted(0);
 		corpsType.setTenantId(SecureUtil.getTenantId());
-		corpsType.setSalesCompanyId(Long.parseLong(AuthUtil.getDeptId()));
+		if (AuthUtil.getUserRole().contains("dealer")) {
+			corpsType.setCreateDept(Long.parseLong(AuthUtil.getDeptId()));
+		}
 		IPage<CorpsTypeVO> pages = corpsTypeService.selectCorpsTypePage(Condition.getPage(query), corpsType);
 		return R.data(pages);
 	}

blade-service/gubersail-dealer-admin/src/main/java/com/gubersail/admin/corp/service/impl/CorpsDescServiceImpl.java

@@ -623,7 +623,7 @@ public class CorpsDescServiceImpl extends ServiceImpl<CorpsDescMapper, PjCorpsDe
 		if (CollectionUtils.isNotEmpty(corpsDesc.getCorpsAddrList())) {
 			long count = corpsDesc.getCorpsAddrList().stream().filter(e -> "1".equals(e.getDefaultAddres())).count();
 			if (count != 1) {
-				throw new RuntimeException("默认地址唯一");
+				throw new RuntimeException("开启默认地址");
 			}
 			corpsDesc.getCorpsAddrList().forEach(addr -> {
 				addr.setPid(pId);

blade-service/gubersail-dealer-admin/src/main/java/com/gubersail/admin/ship/service/impl/ShipServiceImpl.java

@@ -350,7 +350,6 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 				if ("1".equals(goodsDesc.getWhether()) && ObjectUtils.isNull(item.getDot())) {
 					throw new RuntimeException("商品：" + goodsDesc.getCname() + ",请选择批次号");
 				}
-				List<TireStockDesc> tireStockDescList = new ArrayList<>();
 				//管理批次号
 				TireStockDesc stockOne;
 				if (ObjectUtil.isNotEmpty(goodsDesc.getWhether()) && "1".equals(goodsDesc.getWhether())) {