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

src/main/java/com/xjrsoft/module/schedule/controller/ScheduleController.java

@@ -243,7 +243,7 @@ public class ScheduleController {
     @GetMapping(value = "/login-url")
     @ApiOperation(value = "获取单点登录地址")
     @SaCheckPermission("evaluateobject:detail")
-    public RT<String> getAccessToken(CourseTablePreCheckDto dto) throws Exception {
+    public RT<String> getAccessToken() throws Exception {
         XjrUser xjrUser = teacherService.getById(StpUtil.getLoginIdAsLong());
         long timeMillis = System.currentTimeMillis();
         String sign = ScheduleUtil.createSign(timeMillis);
@@ -256,6 +256,9 @@ public class ScheduleController {
             String result = ScheduleUtil.doPost(url, jsonObject.toString(), sign, timeMillis);
             JsonParser parser = new JsonParser();
             JsonObject resultJson = parser.parse(result).getAsJsonObject();
+            if(resultJson.get("code").getAsInt() != 0){
+                return RT.error("无登录权限");
+            }
             JsonObject dataJson = resultJson.get("data").getAsJsonObject();
             String loginUrl = ScheduleUtil.hostUrl + "?access_token=" + dataJson.get("access_token").getAsString();
             return RT.ok(loginUrl);

src/main/java/com/xjrsoft/module/student/mapper/BaseStudentSchoolRollMapper.java

@@ -3,10 +3,13 @@ package com.xjrsoft.module.student.mapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseMapper;
 import com.xjrsoft.module.student.dto.BaseStudentInfoPageDto;
+import com.xjrsoft.module.student.dto.UpdateBaseStudentInfoDto;
 import com.xjrsoft.module.student.entity.BaseStudentSchoolRoll;
 import com.xjrsoft.module.student.vo.BaseStudentInfoDetailVo;
 import com.xjrsoft.module.student.vo.BaseStudentInfoPageVo;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Update;
 
 /**
  * @title: mapper
@@ -21,5 +24,7 @@ public interface BaseStudentSchoolRollMapper extends MPJBaseMapper<BaseStudentSc
 
     BaseStudentInfoDetailVo getInfoById(Long id);
 
+    Boolean updateInfoByUserId(UpdateBaseStudentInfoDto dto, Long id);
+
 }
 

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

@@ -1,9 +1,7 @@
 package com.xjrsoft.module.student.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseServiceImpl;
-import com.xjrsoft.module.room.entity.RoomBed;
 import com.xjrsoft.module.room.mapper.RoomBedMapper;
 import com.xjrsoft.module.room.vo.RoomBedInfoVo;
 import com.xjrsoft.module.student.dto.BaseStudentInfoPageDto;
@@ -36,13 +34,7 @@ public class BaseStudentSchoolRollServiceImpl extends MPJBaseServiceImpl<BaseStu
     @Override
     public Boolean updateInfo(UpdateBaseStudentInfoDto dto) {
         for (Long id : dto.getUserIds()) {
-            BaseStudentSchoolRoll roll = baseStudentSchoolRollMapper.selectById(id);
-            UpdateWrapper<BaseStudentSchoolRoll> updateWrapper = new UpdateWrapper<>();
-            updateWrapper.eq("user_id", id);
-            updateWrapper.set("archives_status", dto.getArchivesStatus());
-            updateWrapper.set("roll_modality", dto.getRollModality());
-            updateWrapper.set("stduy_status", dto.getStduyStatus());
-            baseStudentSchoolRollMapper.update(roll, updateWrapper);
+            baseStudentSchoolRollMapper.updateInfoByUserId(dto, id);
         }
         return true;
     }

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

@@ -55,4 +55,11 @@
         LEFT JOIN base_major_set t10 ON t3.major_set_id = t10.id
         WHERE t2.id = #{id}
     </select>
+    <update id="updateInfoByUserId" parameterType="com.xjrsoft.module.student.dto.UpdateBaseStudentInfoDto">
+        UPDATE base_student_school_roll SET delete_mark = delete_mark
+        <if test="dto.rollModality != null and dto.rollModality != ''">,roll_modality = #{dto.rollModality} </if>
+        <if test="dto.archivesStatus != null and dto.archivesStatus != ''">,archives_status = #{dto.archivesStatus} </if>
+        <if test="dto.stduyStatus != null and dto.stduyStatus != ''">,stduy_status = #{dto.stduyStatus} </if>
+        where user_id = #{id}
+    </update>
 </mapper>