Merge branch 'master' of http://121.42.53.174:3000/jiapeng/platformConsole

src/main/java/com/ekexiu/project/platform/organization/OrgService.java

@@ -26,8 +26,8 @@ import java.util.Map;
@Path("/org")
public class OrgService {
	private String syncUrl = "http://www.ekexiu.com/ajax/platform/ids/buttedOrgs?pid=";
	private String infoUrl = "http://www.ekexiu.com/ajax/org/";
	private String syncUrl = "http://192.168.3.233:81/ajax/platform/ids/buttedOrgs?pid=";
	private String infoUrl = "http://192.168.3.233:81/ajax/org/";
    @Autowrie
    private OrgDao orgDao;
@@ -84,7 +84,7 @@ public class OrgService {
    	 
    	 if(buttedProfessores.size()>0){
    		 for(Map<String,String> map:buttedProfessores){
    			 String uid = map.get("uid");
    			 String uid = map.get("oid");
    			 if(uid!= null){
    				 Organization p = null;
    				for(Organization pe:existsList){

src/main/java/com/ekexiu/project/platform/professor/ProfessorService.java

@@ -25,8 +25,8 @@ import java.util.Map;
@Path("/professor")
public class ProfessorService {
	private String syncUrl = "http://www.ekexiu.com/ajax/platform/ids/buttedProfessors?pid=";
	private String infoUrl = "http://www.ekexiu.com/ajax/professor/baseInfo/";
	private String syncUrl = "http://192.168.3.233:81/ajax/platform/ids/buttedProfessors?pid=";
	private String infoUrl = "http://192.168.3.233:81/ajax/professor/baseInfo/";
	@Autowrie
	private ProfessorDao professorDao;