diff --git a/admin-core/src/main/resources/sql/core/coreUser.md b/admin-core/src/main/resources/sql/core/coreUser.md index 85e771a1..ef588af1 100644 --- a/admin-core/src/main/resources/sql/core/coreUser.md +++ b/admin-core/src/main/resources/sql/core/coreUser.md @@ -67,7 +67,7 @@ getStudentByNoOfNet === SELECT core_user.old_id AS userId, - core_user.NAME AS NAME, + student.student_name AS NAME, core_role.NAME AS roleName, core_user.CODE as username, 4 as roleId, diff --git a/web/src/main/java/com/ibeetl/jlw/service/SchoolClassService.java b/web/src/main/java/com/ibeetl/jlw/service/SchoolClassService.java index dcf45015..fe088204 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/SchoolClassService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/SchoolClassService.java @@ -210,7 +210,7 @@ public class SchoolClassService extends CoreBaseService { insertSchoolClass.setAddTime(new Date()); insertSchoolClass.setOrgId(orgId); insertSchoolClass.setUserId(userId); - Integer icibtClassId = BXApiUtil.createBxClass(schoolClass.getClassName(), universitiesColleges.getIcibtSchoolId()); + Integer icibtClassId = BXApiUtil.createBxClass(insertSchoolClass.getClassName(), universitiesColleges.getIcibtSchoolId()); insertSchoolClass.setIcibtClassId(icibtClassId); insert(insertSchoolClass); SchoolClass s = new SchoolClass(); diff --git a/web/src/main/java/com/ibeetl/jlw/web/TestController.java b/web/src/main/java/com/ibeetl/jlw/web/TestController.java index dea06ca4..99eff767 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TestController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TestController.java @@ -7,6 +7,8 @@ import com.google.gson.Gson; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.google.gson.reflect.TypeToken; +import com.ibeetl.admin.core.dao.CoreDictDao; +import com.ibeetl.admin.core.entity.CoreDict; import com.ibeetl.admin.core.entity.CoreUser; import com.ibeetl.admin.core.service.CorePlatformService; import com.ibeetl.admin.core.service.CoreUserService; @@ -24,6 +26,7 @@ import io.swagger.annotations.ApiOperation; import org.apache.regexp.RE; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -80,6 +83,9 @@ public class TestController { private final static String USER = "sa"; private final static String PASSWORD = "sztzjy@2017"; + @Autowired + CoreDictDao coreDictDao; + // 打开数据库连接 public static Connection openConn() throws SQLException { try { @@ -517,7 +523,7 @@ public class TestController { " JOIN EduMajors maj ON stu.MajorId = maj.Id " + " JOIN EduSchools sch ON stu.SchoolId = sch.Id " + " JOIN EduClasses cla ON stu.ClassId = cla.Id" + - " join EduUsers us on stu.StudentNo = us.UserName where stu.isdeleted=0 "; + " join EduUsers us on stu.StudentNo = us.UserName where stu.isdeleted=0 and cla.id = 1274"; ps = conn.prepareStatement(sql); ResultSet resultSet = ps.executeQuery(); int i = 0; @@ -1674,4 +1680,11 @@ public class TestController { } } } + + @ApiOperation("异常测试") + @GetMapping("errorTest") + public void errorTest() { + List aLlListByTable = coreDictDao.findALlListByTable("student_id", "student_name", "", "student", new String[]{"student_status=1"}); + int a = 0; + } } \ No newline at end of file