|
@@ -574,17 +574,6 @@ public class ProjectRecordsController extends BaseController {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-// /**
|
|
|
-// * 无合同状态下,输入联系人,查询系统中是否有此联系人
|
|
|
-// * @param workClientLinkman
|
|
|
-// * @return
|
|
|
-// */
|
|
|
-// @ResponseBody
|
|
|
-// @RequestMapping("queryLinkMan")
|
|
|
-// public WorkClientLinkman queryLinkMan(WorkClientLinkman workClientLinkman){
|
|
|
-// return projectRecordsService.getLinkMan(workClientLinkman);
|
|
|
-// }
|
|
|
-
|
|
|
/**
|
|
|
* 项目登记新增客户管理
|
|
|
*/
|
|
@@ -617,15 +606,17 @@ public class ProjectRecordsController extends BaseController {
|
|
|
@RequestMapping(value = "getLinkManByClientId")
|
|
|
public Map<String, Object> queryWorkClientLinkMen(String clientId){
|
|
|
WorkClientLinkman linkman = workClientInfoService.queryLinkManByClientId(clientId);
|
|
|
- WorkClientInfo workClientInfo = workClientInfoService.get(clientId);
|
|
|
- Map<String,Object> map = new HashMap<>();
|
|
|
- map.put("id",linkman.getId());
|
|
|
- map.put("clientId",workClientInfo.getId());
|
|
|
- map.put("clientName",workClientInfo.getName());
|
|
|
- map.put("linkName",linkman.getName());
|
|
|
- map.put("linkMobile",linkman.getLinkMobile());
|
|
|
- map.put("linkPhone",linkman.getLinkPhone());
|
|
|
- return map;
|
|
|
-
|
|
|
+ if (linkman != null) {
|
|
|
+ WorkClientInfo workClientInfo = workClientInfoService.get(clientId);
|
|
|
+ Map<String, Object> map = new HashMap<>();
|
|
|
+ map.put("id", linkman.getId());
|
|
|
+ map.put("clientId", workClientInfo.getId());
|
|
|
+ map.put("clientName", workClientInfo.getName());
|
|
|
+ map.put("linkName", linkman.getName());
|
|
|
+ map.put("linkMobile", linkman.getLinkMobile());
|
|
|
+ map.put("linkPhone", linkman.getLinkPhone());
|
|
|
+ return map;
|
|
|
+ }
|
|
|
+ return null;
|
|
|
}
|
|
|
}
|