Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/student/controller/ClassHonorsController.java

@@ -61,6 +61,8 @@ public class ClassHonorsController {
     @ApiOperation(value="班级荣誉列表(分页)")
     @SaCheckPermission("classhonors:detail")
     public RT<PageOutput<ClassHonorsPageVo>> page(@Valid ClassHonorsPageDto dto){
+        //为保证返回给前端的班级id唯一性，将学期id加在班级id上,应该处理
+        dto.setClassId(dto.getClassId() - dto.getBaseSemesterId());
         IPage<ClassHonorsPageVo> page = classHonorsService.getPagePC(dto);
         PageOutput<ClassHonorsPageVo> pageOutput = ConventPage.getPageOutput(page, ClassHonorsPageVo.class);
         return RT.ok(pageOutput);

src/main/java/com/xjrsoft/module/student/controller/StudentHonorsController.java

@@ -50,7 +50,8 @@ public class StudentHonorsController {
     @ApiOperation(value="学生荣誉列表(分页)")
     @SaCheckPermission("studenthonors:detail")
     public RT<PageOutput<StudentHonorsPageVo>> page(@Valid StudentHonorsPageDto dto){
-
+        //传过来的班级id为加上学期id的，应该处理
+        dto.setClassId(dto.getClassId() - dto.getBaseSemesterId());
         Page<StudentHonorsPageVo> page = studentHonorsService.getPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
         PageOutput<StudentHonorsPageVo> pageOutput = ConventPage.getPageOutput(page, StudentHonorsPageVo.class);
         return RT.ok(pageOutput);
@@ -71,7 +72,8 @@ public class StudentHonorsController {
         });
         studentHonorsService.getClassInfo().forEach((node) -> {
             voList.add(new StudentHonorsTreeVo(){{
-                setId(node.getId());
+                //为保证返回给前端的班级id唯一性，将学期id加在班级id上
+                setId(node.getId()+node.getParentId());
                 setName(node.getName());
                 setParentId(node.getParentId());
             }});

src/main/java/com/xjrsoft/module/student/dto/StudentHonorsPageDto.java

@@ -25,4 +25,6 @@ public class StudentHonorsPageDto extends PageInput {
     @ApiModelProperty("班级id")
     public Long classId;
 
+    @ApiModelProperty("学期Id")
+    private Long baseSemesterId;
 }

src/main/java/com/xjrsoft/module/student/service/impl/ClassHonorsServiceImpl.java

@@ -85,7 +85,8 @@ public class ClassHonorsServiceImpl extends MPJBaseServiceImpl<ClassHonorsMapper
         //获取班级荣誉中出现的学期下的所有班级作为树的子级
         classHonorsMapper.getSemesterClass().forEach((node) -> {
             treeVoList.add(new ClassHonorsSemesterClassTreeVo(){{
-                setId(node.getClassId());
+                //为保证返回给前端的班级id唯一性，将学期id加在班级id上
+                setId(node.getClassId() + node.getBaseSemesterId());
                 setName(node.getClassIdCN());
                 setParentId(node.getBaseSemesterId());
             }});

src/main/java/com/xjrsoft/module/system/dto/LoginByCodeDto.java

@@ -10,4 +10,8 @@ public class LoginByCodeDto {
     @ApiModelProperty("Code")
     @NotBlank(message = "Code不能为空！")
     private String code;
+
+    @ApiModelProperty("type")
+    @NotBlank(message = "类型不能为空！")
+    private Integer type;
 }

src/main/java/com/xjrsoft/module/system/service/impl/LoginServiceImpl.java

@@ -119,16 +119,14 @@ public class LoginServiceImpl implements ILoginService {
         if (ids == null) throw new MyException("code无效");
 
         LambdaQueryWrapper<User> queryWrapper = new LambdaQueryWrapper<>();
-        if (StringUtils.isNotEmpty(ids[1])) {
-            queryWrapper.eq(User::getUnionId, ids[1]);
-            result.setUnionId(ids[1]);
-        } else {
-            queryWrapper.eq(User::getOpenId, ids[0]);
+        if (dto.getType() == 0) {
             result.setOpenid(ids[0]);
+            queryWrapper.eq(User::getOpenId, ids[0]);
+        } else {
+            result.setUnionId(ids[1]);
+            queryWrapper.eq(User::getUnionId, ids[1]);
         }
         User loginUser = userService.getOne(queryWrapper);
-
-//        result.setOpenid(openId);
         if (loginUser == null) {
             return result;
         }

src/main/resources/mapper/student/StudentHonorsMapper.xml

@@ -10,7 +10,7 @@
         LEFT JOIN xjr_dictionary_detail t3 ON t1.honors_level = t3.code AND t3.item_id = 1731576278748352514
         LEFT JOIN xjr_dictionary_detail t4 ON t1.honors_type = t4.code AND t4.item_id = 1731577666295418881
         LEFT JOIN xjr_dictionary_detail t5 ON t1.honors_grade = t5.code AND t5.item_id = 1731577201793028098
-        WHERE t1.delete_mark = 0 AND t1.class_id = #{dto.classId} and t1.status = 1
+        WHERE t1.delete_mark = 0 AND t1.class_id = #{dto.classId} AND t1.base_semester_id = #{dto.baseSemesterId} and t1.status = 1
     </select>
 
     <select id="getSemesterInfo" resultType="com.xjrsoft.module.student.vo.StudentHonorsListVo">