fix

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

@@ -614,10 +614,8 @@ public class StaffApiServiceImpl implements StaffApiService {
 	    		staff.setPhoneNumber(phoneNumber);
 	    		staff.setPostion(postion);
 	    		staff.setSex(sex);
-	    		if(staff.getActiveFlag() != null && staff.getActiveFlag() != 1){
-	    			staff.setStaffName(staffName);
-	    		}
-	    		//staff.setNickName(staffName);
+	    		staff.setStaffName(staffName);
+	    		staff.setNickName(staffName);
 	    		staff.setSyncPostionFlag(1);
 	    		StaffDepartmentRelatedDTO isCodeExist = this.getDepartmentIdAndCode(departmentId,code);
 	    		logger.info("【gic导购新增】isCodeExist={}",JSON.toJSONString(isCodeExist));
@@ -649,7 +647,10 @@ public class StaffApiServiceImpl implements StaffApiService {
 	    	//修改
 	    	}else{
 	    		staff.setHeadImg(headPic);
-	    		staff.setStaffName(staffName);
+//	    		staff.setStaffName(staffName);
+	    		if(staff.getActiveFlag() != null && staff.getActiveFlag() != 1){
+	    			staff.setStaffName(staffName);
+	    		}
 				List<StaffDepartmentRelatedDTO> relatedList = this.listStaffDepartmentByStaffId(staffId);
 				Map<String,StaffDepartmentRelatedDTO> map = com.gic.commons.util.CollectionUtil.toMap(relatedList, "departmentId");
 				String departmentIds = "";