Browse Source

发起客户档案完善修改

anderx 1 year ago
parent
commit
8e41247206

+ 7 - 14
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -141,18 +141,16 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 			Integer pageSize) {
 		cli.setType(AFTConstants.USER_TYPE_PERSONAL);
 		Map<String, Object> params = disposeParams(cli);
-		Pagination<CustomerListOut> list = (Pagination<CustomerListOut>) findPage("selectPublicPersonalCustomerList",
+        return (Pagination<CustomerListOut>) findPage("selectPublicPersonalCustomerList",
 				"selectPublicPersonalCustomerCount", params, pageNo, pageSize);
-		return list;
 	}
 
 	@Override
 	public Pagination<CustomerListOut> listAllPersonalCustomer(CustomerListIn cli, Integer pageNo, Integer pageSize) {
 		cli.setType(AFTConstants.USER_TYPE_PERSONAL);
 		Map<String, Object> params = disposeParams(cli);
-		Pagination<CustomerListOut> list = (Pagination<CustomerListOut>) findPage("selectPersonalCustomerList",
+        return (Pagination<CustomerListOut>) findPage("selectPersonalCustomerList",
 				"selectPersonalCustomerCount", params, pageNo, pageSize);
-		return list;
 	}
 
 	@Override
@@ -161,9 +159,8 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		cli.setType(AFTConstants.USER_TYPE_PERSONAL);
 		cli.setShareType(String.valueOf(AFTConstants.USER_SHARE_PRIVATE));
 		Map<String, Object> params = disposeParams(cli);
-		Pagination<CustomerListOut> list = (Pagination<CustomerListOut>) findPage("selectManagePersonalCustomerList",
+        return (Pagination<CustomerListOut>) findPage("selectManagePersonalCustomerList",
 				"selectManagePersonalCustomerCount", params, pageNo, pageSize);
-		return list;
 	}
 
 	@Override
@@ -213,9 +210,8 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		cli.setType(AFTConstants.USER_TYPE_ORGANIZATION);
 		cli.setShareType(String.valueOf(AFTConstants.USER_SHARE_PUBLIC));
 		Map<String, Object> params = disposeParams(cli);
-		Pagination<CustomerListOut> p = (Pagination<CustomerListOut>) findPage("selectPublicOrganizationCustomerList",
+        return (Pagination<CustomerListOut>) findPage("selectPublicOrganizationCustomerList",
 				"selectPublicOrganizationCustomerCount", params, pageNo, pageSize);
-		return p;
 	}
 
 	@Override
@@ -286,7 +282,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 	}
 
 	private Map<String, Object> disposeParams(CustomerListIn cli) {
-		Map<String, Object> params = new HashMap<String, Object>();
+		Map<String, Object> params = new HashMap<>();
 		if (StringUtils.isNotBlank(cli.getType()))
 			params.put("type", Integer.parseInt(cli.getType()));
 		if (StringUtils.isNotBlank(cli.getName()))
@@ -440,11 +436,8 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		cob.setMajor(AFTConstants.YES);
 		organizationContactBookMapper.insert(cob);
 		// 新增锁定数据
-		boolean isUs = false;
-		if (uid.contains(",")) {
-			isUs = true;
-		}
-		List<String> uList = new ArrayList<>();
+		boolean isUs = uid.contains(",");
+        List<String> uList = new ArrayList<>();
 		if (isUs) {
 			uList = Arrays.asList(uid.split(","));
 		}