2022年10月31日08:34:49

blade-service/blade-client/src/main/java/org/springblade/client/corps/controller/CorpsDescController.java

@@ -16,6 +16,8 @@ import org.springblade.client.corps.excel.*;
 import org.springblade.client.corps.service.ICorpsDescService;
 import org.springblade.client.corps.service.ICorpsTypeDescService;
 import org.springblade.client.corps.service.ICorpsTypeService;
+import org.springblade.client.corps.service.impl.CorpsAddrServiceImpl;
+import org.springblade.client.entity.CorpsAddr;
 import org.springblade.client.entity.CorpsDesc;
 import org.springblade.client.entity.CorpsType;
 import org.springblade.client.entity.CorpsTypeDesc;
@@ -63,6 +65,7 @@ public class CorpsDescController extends BladeController {
 	private final IFinanceClient financeClient;
 	private final ICorpsTypeDescService corpsTypeDescService;
 	private final IRedisClient redisClient;//redis缓存处理
+	private CorpsAddrServiceImpl corpsAddrService;
 
 	/**
 	 * 详情
@@ -128,6 +131,11 @@ public class CorpsDescController extends BladeController {
 					).stream().map(CorpsType::getCname).collect(Collectors.joining(","));
 					item.setCorpsTypeName(typeName);
 				}
+				//获取客户地址
+				List<CorpsAddr> corpsAddrList = corpsAddrService.list(new QueryWrapper<CorpsAddr>().eq("pid", item.getId()).eq("is_deleted", 0).eq("status", 0).eq("type", 0));
+				if (corpsAddrList != null && corpsAddrList.size()>0) {
+					item.setAddr(corpsAddrList.get(0).getDetailedAddress());
+				}
 			});
 		}
 		return R.data(pages);
@@ -239,6 +247,9 @@ public class CorpsDescController extends BladeController {
 //			corpsDesc.setLabels("\"\",\"\",\"\",\"\"");
 			corpsDesc.setLabels(",,,");
 		}
+		if (ObjectUtils.isNull(corpsDesc.getCorpsTypeId())){
+			corpsDesc.setCorpsTypeId("1586314518265356290");
+		}
 		R corpsDesc1 = corpsDescService.submit(corpsDesc);
 		redisClient.basicData("corps");
 		return corpsDesc1;

blade-service/blade-client/src/main/java/org/springblade/client/corps/service/impl/CorpsAddrServiceImpl.java

@@ -57,9 +57,9 @@ public class CorpsAddrServiceImpl extends ServiceImpl<CorpsAddrMapper, CorpsAddr
 			for (CorpsAddr corpsAddr : corpsDesc.getCorpsAddrList()) {
 				corpsAddr.setPid(pId);
 				corpsAddr.setTenantId(tenantId);
-				if (StringUtil.isBlank(corpsAddr.getAddr())){
-					throw new RuntimeException("地址不能为空");
-				}
+//				if (StringUtil.isBlank(corpsAddr.getAddr())){
+//					throw new RuntimeException("地址不能为空");
+//				}
 				CorpsAddr corpsAttn = baseMapper.selectCorpsAddrCode(corpsAddr.getAddr(), corpsAddr.getPid(), SecureUtil.getTenantId());
 				if (corpsAttn != null && corpsAttn.getId() == null) {
 					throw new RuntimeException("地址不能重复:"+corpsAddr.getAddr()+"已存在");

blade-service/blade-client/src/main/java/org/springblade/client/corps/service/impl/CorpsDescServiceImpl.java

@@ -21,6 +21,7 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.core.tool.utils.CollectionUtil;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.finance.feign.IFinanceClient;
@@ -178,7 +179,17 @@ public class CorpsDescServiceImpl extends ServiceImpl<CorpsDescMapper, CorpsDesc
 			desc.setCorpsAddrList(corpsAddrService.list(new QueryWrapper<CorpsAddr>().eq("pid", corpsDesc.getId()).eq("is_deleted", 0).eq("status", 0)));
 			//获取客户类别
 			List<String> longs = corpsTypeDescMapper.selectTypeId(corpsDesc.getId());
-			desc.setCorpsTypeId(String.join(",", longs));
+			StringBuilder corpsTypeName = new StringBuilder();
+			if(ObjectUtils.isNotNull(longs)){
+				for (String id:longs) {
+					String name = corpsTypeMapper.selectById(Long.parseLong(id)) == null ?"":corpsTypeMapper.selectById(Long.parseLong(id)).getCname();
+					corpsTypeName.append(name).append(",");
+				}
+				String corpsName = corpsTypeName.substring(0,corpsTypeName.length()-1);
+				desc.setCorpsTypeName(corpsName);
+			}else{
+				desc.setCorpsTypeName("");
+			}
 		}
 		return desc;
 	}