fix

code/sapparent/sapservice/src/main/java/org/fouram/service/SapUserService.java

@@ -557,12 +557,20 @@ public class SapUserService extends BaseService {
 		return (List<SapUser>) findList("SapUserMapper.selectLeaveAndEntryList", date);
 	}
 
-	public void uploadDevEmpUserDetailInfo(SapUser user, Integer type) throws Exception {
-		uploadEmpUserDetailInfo(user, type, true);
+	public void uploadDevEmpUserDetailInfo(SapUser user, Integer type) {
+		try {
+			uploadEmpUserDetailInfo(user, type, true);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
 	}
 
-	public void uploadMasEmpUserDetailInfo(SapUser user, Integer type) throws Exception {
-		uploadEmpUserDetailInfo(user, type, false);
+	public void uploadMasEmpUserDetailInfo(SapUser user, Integer type) {
+		try {
+			uploadEmpUserDetailInfo(user, type, false);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
 	}
 
 	private void uploadEmpUserDetailInfo(SapUser user, Integer type, boolean devFlag) throws Exception {
@@ -599,7 +607,11 @@ public class SapUserService extends BaseService {
 		}
 		SapEmpJob empJob = empJobService.selectOneByPersonId(user.getPersonId());
 		if (empJob != null) {
-			reqdata.setProvinceName(empJob.getLocationName());
+			if("广州".equals(empJob.getLocationName())) {
+				reqdata.setProvinceName("广东");
+			}else {
+				reqdata.setProvinceName(empJob.getLocationName());
+			}
 			reqdata.setCityName(empJob.getLocationName());
 		}
 		SapPerPerson perPerson = personService.selectOneByPersonId(user.getPersonId());