管乐迷迭代

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/EmployeeInfoDao.java

@@ -4,11 +4,9 @@ import com.ym.mec.biz.dal.dto.EmployeeInfoDto;
 import com.ym.mec.biz.dal.entity.EmployeeInfo;
 import com.ym.mec.common.dal.BaseDAO;
 
-import java.util.List;
-
 public interface EmployeeInfoDao extends BaseDAO<Long, EmployeeInfo> {
 
 	EmployeeInfoDto queryDetail(Long id);
 
-    List<EmployeeInfo> findByPhone(String mobileNo);
+    EmployeeInfo findByPhone(String mobileNo);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/EmployeeInfoService.java

@@ -4,11 +4,9 @@ import com.ym.mec.biz.dal.dto.EmployeeInfoDto;
 import com.ym.mec.biz.dal.entity.EmployeeInfo;
 import com.ym.mec.common.service.BaseService;
 
-import java.util.List;
-
 public interface EmployeeInfoService extends BaseService<Long, EmployeeInfo> {
 
 	EmployeeInfoDto queryDetail(Long id);
 
-    List<EmployeeInfo> findByPhone(String mobileNo);
+    EmployeeInfo findByPhone(String mobileNo);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/EmployeeInfoServiceImpl.java

@@ -10,11 +10,9 @@ import com.ym.mec.biz.service.EmployeeInfoService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 
-import java.util.List;
-
 @Service
 public class EmployeeInfoServiceImpl extends BaseServiceImpl<Long, EmployeeInfo>  implements EmployeeInfoService {
-	
+
 	@Autowired
 	private EmployeeInfoDao employeeInfoDao;
 
@@ -29,7 +27,7 @@ public class EmployeeInfoServiceImpl extends BaseServiceImpl<Long, EmployeeInfo>
 	}
 
     @Override
-    public List<EmployeeInfo> findByPhone(String mobileNo) {
+    public EmployeeInfo findByPhone(String mobileNo) {
 		return employeeInfoDao.findByPhone(mobileNo);
     }
 

mec-web/src/main/java/com/ym/mec/web/controller/EmployeeInfoController.java

@@ -4,7 +4,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
 import java.util.Date;
-import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -31,10 +30,10 @@ public class EmployeeInfoController extends BaseController {
 
     @Autowired
     private EmployeeInfoService employeeInfoService;
-    
+
     @Autowired
     private EmployeeVisitService employeeVisitService;
-    
+
 	@Autowired
 	private SysUserFeignService sysUserFeignService;
 
@@ -47,15 +46,11 @@ public class EmployeeInfoController extends BaseController {
 		if (sysUser == null) {
 			return failed("用户信息获取失败");
 		}
-        List<EmployeeInfo> infoList = employeeInfoService.findByPhone(employeeInfo.getMobileNo());
-		if(infoList != null && infoList.size() > 2){
-            return failed("该手机号已在系统中存在多条，请更新原有数据");
-        }
-		if(infoList != null && infoList.size() > 0){
+        EmployeeInfo info = employeeInfoService.findByPhone(employeeInfo.getMobileNo());
+		if(info != null){
 		    if(employeeInfo.getCover()){
-                EmployeeInfo info = infoList.get(0);
-                employeeInfo.setId(info.getId());
                 employeeInfo.setOperatorId(sysUser.getId());
+                employeeInfo.setId(info.getId());
                 Date date = new Date();
                 employeeInfo.setUpdateTime(date);
                 employeeInfo.setCreateTime(date);