boenewlogin band处理

servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java

@@ -122,13 +122,20 @@ public class OutSideDataServiceImpl implements IOutSideDataService {
 	            //这里应该是单独的线程去处理
 	        	user.setId(getNodeText(result.get("userId")));//最新接口变化，id改成userId
 	        	String band=getNodeText(result.get("bandCode"));
-	        	if(StringUtils.isNotBlank(band) && band.length()>4) {
-	        		String bandNum=band.substring(4);
-	        		user.setBandLevel(Integer.valueOf(bandNum));
-	        	}else {
-	        		user.setBandLevel(0);
-	        	}
-	        	user.setAvatar(getNodeText(result.get("avatar")));
+				try {
+					if(StringUtils.isNotBlank(band) && band.length()>4 && band.contains("band")) {
+						String bandNum=band.substring(4);
+						user.setBandLevel(Integer.valueOf(bandNum));
+					}else if (StringUtils.isNotBlank(band) && band.length()>4 && band.contains("Level")) {
+						String bandNum=band.substring(5);
+						user.setBandLevel(Integer.valueOf(bandNum));
+					}else {
+						user.setBandLevel(0);
+					}
+				} catch (NumberFormatException e) {
+					user.setBandLevel(0);
+				}
+				user.setAvatar(getNodeText(result.get("avatar")));
 	        	user.setCode(getNodeText(result.get("userNo")));
 	        	
 	        	if(StringUtils.isBlank(user.getCode())) {

servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java

@@ -140,6 +140,9 @@ public class CasesApi extends ApiBaseController {
             List<Cases> cases = views.getList();
             if (CollUtil.isNotEmpty(cases)) {
                 for (Cases c : cases) {
+                    if ("null".equals(c.getSummary())) {
+                        c.setSummary(null);
+                    }
                     StringBuffer stringBuffer = new StringBuffer();
                     List<CasesMajorType> caseId = casesMajorTypeDao.findList(FieldFilters.eq("caseId", c.getId()));
                     if (caseId != null && !caseId.isEmpty()) {

servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java

@@ -480,7 +480,7 @@ public class CourseServiceImpl implements ICourseService {
         String sql = "SELECT DISTINCT\n" +
                 "rt.course_id\n" +
                 "FROM\n" +
-                "boe.student s INNER JOIN boe.router_task rt on s.pid=rt.router_id inner join boe_course c on c.id=rt.course_id\n" +
+                "boe_new.student s INNER JOIN boe_new.router_task rt on s.pid=rt.router_id inner join boe_course c on c.id=rt.course_id\n" +
                 "\n" +
                 "WHERE\n" +
                 "\n" +
@@ -503,7 +503,7 @@ public class CourseServiceImpl implements ICourseService {
         String sql = "SELECT DISTINCT\n" +
                 "pt.course_id\n" +
                 "FROM\n" +
-                "boe.student s INNER JOIN boe.project_task pt on s.pid=pt.project_id inner join boe_course c on c.id=pt.course_id\n" +
+                "boe_new.student s INNER JOIN boe_new.project_task pt on s.pid=pt.project_id inner join boe_course c on c.id=pt.course_id\n" +
                 "\n" +
                 "WHERE\n" +
                 "\n" +
@@ -560,8 +560,8 @@ public class CourseServiceImpl implements ICourseService {
         String sql = "SELECT DISTINCT\n" +
                 "\tc.id \n" +
                 "FROM\n" +
-                "\tboe.student s\n" +
-                "\tINNER JOIN boe.grow_task gt ON s.pid = gt.grow_id\n" +
+                "\tboe_new.student s\n" +
+                "\tINNER JOIN boe_new.grow_task gt ON s.pid = gt.grow_id\n" +
                 "\tINNER JOIN boe_course c ON gt.course_id = c.id \n" +
                 "WHERE\n" +
                 "\ts.type = 14 \n" +