管乐迷迭代

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

@@ -4,9 +4,11 @@ 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);
 
-    EmployeeInfo findByPhone(String mobileNo);
+    List<EmployeeInfo> findByPhone(String mobileNo);
 }

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

@@ -4,9 +4,11 @@ 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);
 
-    EmployeeInfo findByPhone(String mobileNo);
+    List<EmployeeInfo> findByPhone(String mobileNo);
 }

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

@@ -10,6 +10,8 @@ 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 {
 	
@@ -27,7 +29,7 @@ public class EmployeeInfoServiceImpl extends BaseServiceImpl<Long, EmployeeInfo>
 	}
 
     @Override
-    public EmployeeInfo findByPhone(String mobileNo) {
+    public List<EmployeeInfo> findByPhone(String mobileNo) {
 		return employeeInfoDao.findByPhone(mobileNo);
     }
 

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

@@ -4,6 +4,7 @@ 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;
@@ -46,9 +47,14 @@ public class EmployeeInfoController extends BaseController {
 		if (sysUser == null) {
 			return failed("用户信息获取失败");
 		}
-        EmployeeInfo info = employeeInfoService.findByPhone(employeeInfo.getMobileNo());
-		if(info != null && !employeeInfo.getCover()){
+        List<EmployeeInfo> infoList = employeeInfoService.findByPhone(employeeInfo.getMobileNo());
+		if(infoList != null && infoList.size() > 2){
+            return failed("该手机号已在系统中存在多条，请更新原有数据");
+        }
+		if(infoList != null && infoList.size() > 0){
 		    if(employeeInfo.getCover()){
+                EmployeeInfo info = infoList.get(0);
+                employeeInfo.setId(info.getId());
                 employeeInfo.setOperatorId(sysUser.getId());
                 Date date = new Date();
                 employeeInfo.setUpdateTime(date);