45646145853254

code/finance_serv/src/main/java/com/vion/financial/service/imp/ContractServiceImpl.java

@@ -187,26 +187,31 @@ public class ContractServiceImpl implements ContractService {
 			List<Map> list_city=null;
 			List<Map> list_city=null;
 			List<Map> list_county=null;
 			List<Map> list_county=null;
 			int count=0;
 			int count=0;
-			if (StringUtils.isNotBlank(selectVo.getSalesperson_name__like())) {
 			// 调用auth服务的接口获取用户列表信息
 			// 调用auth服务的接口获取用户列表信息
 			String url = financeConfig.getAuthurl();
 			String url = financeConfig.getAuthurl();
-				String result = HttpNetClient.doGet(url+"?username="+selectVo.getSalesperson_name__like(), null);
+			String result = HttpNetClient.doGet(url, null);
 			Map map =  JavaBean2Json.Json2JavaBean(result, Map.class);
 			Map map =  JavaBean2Json.Json2JavaBean(result, Map.class);
 			list_data = (List<Map>) map.get("list_data");
 			list_data = (List<Map>) map.get("list_data");
+			
+			if (StringUtils.isNotBlank(selectVo.getSalesperson_name__like())) {
+				List<String> salesperson_unids = new ArrayList<String>();
 				if(list_data != null && list_data.size() > 0) {
 				if(list_data != null && list_data.size() > 0) {
-					List<String> salesperson_unids = new ArrayList<String>(list_data.size());
+					String name = "";
 					for(Map _map:list_data) {
 					for(Map _map:list_data) {
+						name = (String) _map.get("name");
+						if(name != null && name.contains(selectVo.getSalesperson_name__like())) {
 							salesperson_unids.add((String) _map.get("user_unid"));
 							salesperson_unids.add((String) _map.get("user_unid"));
 						}
 						}
-					selectVo.setSalesperson_unids(salesperson_unids);
-				}else {
+					}
+					selectVo.setSalesperson_unids(salesperson_unids.size() > 0 ? salesperson_unids : null);
+				}
+				if(salesperson_unids.size() == 0) {
 					resultVo.setList_data(new ArrayList<>());
 					resultVo.setList_data(new ArrayList<>());
 					resultVo.setList_size(selectVo.getLimit()== null ? 0 : selectVo.getLimit());
 					resultVo.setList_size(selectVo.getLimit()== null ? 0 : selectVo.getLimit());
 					resultVo.setOffset(selectVo.getOffset()== null ? 0 : selectVo.getOffset());
 					resultVo.setOffset(selectVo.getOffset()== null ? 0 : selectVo.getOffset());
 					resultVo.setTotal_number(0);
 					resultVo.setTotal_number(0);
 					return resultVo;
 					return resultVo;
 				}
 				}
-				
 			}
 			}
 			count = contractMapper.count(selectVo);
 			count = contractMapper.count(selectVo);
 			List<ContractVo> list = contractMapper.selectByCondition(selectVo);
 			List<ContractVo> list = contractMapper.selectByCondition(selectVo);
@@ -215,11 +220,13 @@ public class ContractServiceImpl implements ContractService {
 				//contractVo.setPaymentAgree_list(paymentAgreeMapper.queryPaymentAgree(contractVo.getContract_unid()));
 				//contractVo.setPaymentAgree_list(paymentAgreeMapper.queryPaymentAgree(contractVo.getContract_unid()));
 				if(list_data != null && list_data.size() > 0) {
 				if(list_data != null && list_data.size() > 0) {
 					for(Map _map:list_data) {
 					for(Map _map:list_data) {
+						if(contractVo.getSalesperson_unid()!=null) {
 						if (contractVo.getSalesperson_unid().equals(_map.get("user_unid"))) {
 						if (contractVo.getSalesperson_unid().equals(_map.get("user_unid"))) {
 							contractVo.setSalesperson_name((String) _map.get("name"));
 							contractVo.setSalesperson_name((String) _map.get("name"));
 						}
 						}
 						}
 						}
 					}
 					}
+				}
 				if(contractVo.getProduct_line_type()!=null) {
 				if(contractVo.getProduct_line_type()!=null) {
 				switch(contractVo.getProduct_line_type()) {
 				switch(contractVo.getProduct_line_type()) {
 					case "1" :
 					case "1" :
@@ -280,11 +287,13 @@ public class ContractServiceImpl implements ContractService {
 			for (ContractVo contractVo : list) {
 			for (ContractVo contractVo : list) {
 				if(list_data != null && list_data.size() > 0) {
 				if(list_data != null && list_data.size() > 0) {
 					for(Map _map:list_data) {
 					for(Map _map:list_data) {
+						if(contractVo.getSalesperson_unid()!=null) {
 						if (contractVo.getSalesperson_unid().equals(_map.get("user_unid"))) {
 						if (contractVo.getSalesperson_unid().equals(_map.get("user_unid"))) {
 							contractVo.setSalesperson_name((String) _map.get("name"));
 							contractVo.setSalesperson_name((String) _map.get("name"));
 						}
 						}
 						}
 						}
 					}
 					}
+				}
 				if(list_province != null && list_province.size() > 0) {
 				if(list_province != null && list_province.size() > 0) {
 					for(Map _map:list_province) {
 					for(Map _map:list_province) {
 						if(contractVo.getProvince()!=null) {
 						if(contractVo.getProvince()!=null) {
@@ -369,11 +378,11 @@ public class ContractServiceImpl implements ContractService {
 */
 */
 		if (StringUtils.isNotBlank(selectVo.getSalesperson_name__like())) {
 		if (StringUtils.isNotBlank(selectVo.getSalesperson_name__like())) {
 			if(list_data != null && list_data.size() > 0) {
 			if(list_data != null && list_data.size() > 0) {
-				List<String> salesperson_unids = new ArrayList<String>(list_data.size());
+				List<String> salesperson_unids = new ArrayList<String>();
 				String name = "";
 				String name = "";
 				for(Map _map:list_data) {
 				for(Map _map:list_data) {
 					name = (String) _map.get("name");
 					name = (String) _map.get("name");
-					if(name.contains(selectVo.getSalesperson_name__like())) {
+					if(name !=null && name.contains(selectVo.getSalesperson_name__like())) {
 						salesperson_unids.add((String) _map.get("user_unid"));
 						salesperson_unids.add((String) _map.get("user_unid"));
 					}
 					}
 				}
 				}