Merge branch 'developer_repair_contact20200408' into 'developer'

Developer repair contact20200408

See merge request !31

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java

@@ -433,7 +433,7 @@ public class StaffApiServiceImpl implements StaffApiService {
 						ClerkDTO clerkDTO= clerkService.getClerkByCodeNoStatus(enterpriseId,related.getClerkCode());
 						//if(!staffDTO.getPhoneNumber().equals(related.getPhoneNumber())||!staffDTO.getStaffName().equals(clerkDTO.getStaffName())){
 						String headPic = staffDTO.getHeadImg();
-						if(clerkDTO != null && (!clerkDTO.getClerkName().equals(staffName) || !staffDTO.getPhoneNumber().equals(clerkDTO.getPhoneNumber())) 
+						if(clerkDTO != null && (StringUtils.isNotBlank(staffName) && !clerkDTO.getClerkName().equals(staffName) || !staffDTO.getPhoneNumber().equals(clerkDTO.getPhoneNumber())) 
 								|| (org.apache.commons.lang3.StringUtils.isNotBlank(headPic) && !headPic.equals(clerkDTO.getImageUrl())) 
 								|| !staffDTO.getSex().equals(clerkDTO.getClerkGender())){
 							logger.info("【员工修改】clerkDTO={}",JSON.toJSONString(clerkDTO));
@@ -693,6 +693,7 @@ public class StaffApiServiceImpl implements StaffApiService {
 	    	//修改
 	    	}else{
 	    		staff.setHeadImg(headPic);
+	    		staff.setPostion(postion);
 //	    		staff.setStaffName(staffName);
 	    		if(staff.getActiveFlag() != null && staff.getActiveFlag() != 1){
 	    			staff.setStaffName(staffName);