diff --git a/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java index 3035ae70..576f6c84 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java @@ -124,15 +124,27 @@ public class OutSideDataServiceImpl implements IOutSideDataService { user.setDeleted(false); user.setDepartId(getNodeText(result.get("orgId")));//最新departId改为orgId user.setDepartName(getNodeText(result.get("orgName")));//无此字段 - user.setOrgNamePath(result.get("orgName").asText()); - //新的接口中没有这个字段了,设置为默认是1 + user.setOrgNamePath(result.get("orgNamePath").asText()); + //新的接口中没有这个字段了,设置为默认是1 20230622 //user.setGender(result.get("gender").asInt());// - user.setGender(1);// + //别是1.男;2.女;3其他;4.保密 20230626 + int gender=result.get("gender").asInt(); + if(gender>2) { + gender=1; + } + user.setGender(gender); user.setKid(getNodeText(result.get("kid"))); //新的字段里没有此字段了,这里设置为0 //user.setLearningDuration(result.get("learningDuration").asInt()); - user.setLearningDuration(0); + //user.setLearningDuration(0); + //改为判断 + JsonNode learningNode=result.get("learningDuration"); + if(learningNode!=null) { + user.setLearningDuration(learningNode.asInt()); + }else { + user.setLearningDuration(0); + } user.setUserType(1);//直接设置为学员 user.setTeacher(false); diff --git a/servers/boe-server-all/src/main/resources/application-pre.properties b/servers/boe-server-all/src/main/resources/application-pre.properties index 45bdeb6d..ca622bc5 100644 --- a/servers/boe-server-all/src/main/resources/application-pre.properties +++ b/servers/boe-server-all/src/main/resources/application-pre.properties @@ -1,5 +1,5 @@ ## redis -spring.redis.database=2 +spring.redis.database=1 spring.redis.host=10.251.160.38 spring.redis.password=qwert!W577 spring.redis.port=6379 diff --git a/servers/boe-server-all/src/main/resources/application-pro.properties b/servers/boe-server-all/src/main/resources/application-pro.properties index cc7a573b..22a0a32c 100644 --- a/servers/boe-server-all/src/main/resources/application-pro.properties +++ b/servers/boe-server-all/src/main/resources/application-pro.properties @@ -31,7 +31,7 @@ server.tomcat.accept-count=200 spring.cloud.nacos.discovery.server-addr=10.251.181.11:8848 ## redis -spring.redis.database=2 +spring.redis.database=1 spring.redis.host=127.0.0.1 spring.redis.password=ENC(zA5LNV8xw3yEx6LMwdGGBGgNsOaD3Cg+) spring.redis.port=6379 diff --git a/servers/boe-server-all/src/main/resources/application-test.properties b/servers/boe-server-all/src/main/resources/application-test.properties index db5d22b6..cc13d63b 100644 --- a/servers/boe-server-all/src/main/resources/application-test.properties +++ b/servers/boe-server-all/src/main/resources/application-test.properties @@ -1,5 +1,5 @@ ## redis -spring.redis.database=2 +spring.redis.database=1 spring.redis.host=10.251.160.38 spring.redis.password=qwert!W577 spring.redis.port=6379