1.课程收藏bug修复

2.资源bug修复
3.系统人员-获取登录信息，加入额外信息

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/ResourceRecordController.java

@@ -15,6 +15,7 @@ package vip.xiaonuo.disk.controller;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollStreamUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
@@ -557,27 +558,30 @@ public class ResourceRecordController {
         String userId = StpLoginUserUtil.getLoginUser().getId();
         param.put("userId", userId);
         Map<String,Object> result=courseAuditRecordService.queryRecentlyRecord(param);
-        //获取关键词
-        String keyword= String.valueOf(result.get("keyword"));
-        keyword=StringUtils.deleteWhitespace(keyword);
-        if(StringUtils.isNotEmpty(keyword))
-        {
-            String[] keywordIdArray=keyword.split(",");
-            List<Integer> keywordIdList = Arrays.stream(keywordIdArray)
-                    .map(Integer::parseInt)
-                    .collect(Collectors.toList());
-            List<KeyWord>  keywordList=keyWordService.selectByIds(keywordIdList);
-            result.put("keywordList",keywordList);
-        }
-        //获取私密权限下关联的用户
-        param.clear();
-        if(StringUtils.isNotEmpty(String.valueOf(result.get("authType"))))
+        if(ObjectUtil.isNotEmpty(result))
         {
-            if("1".equals(String.valueOf(result.get("authType"))))
+            //获取关键词
+            String keyword= String.valueOf(result.get("keyword"));
+            keyword=StringUtils.deleteWhitespace(keyword);
+            if(StringUtils.isNotEmpty(keyword))
             {
-                param.put("resourceRecord", req.getParameter("id"));
-                List<ResourceRecordUserRelate> userRelateList=resourceRecordUserRelateService.allList(param);
-                result.put("userRelateList",userRelateList);
+                String[] keywordIdArray=keyword.split(",");
+                List<Integer> keywordIdList = Arrays.stream(keywordIdArray)
+                        .map(Integer::parseInt)
+                        .collect(Collectors.toList());
+                List<KeyWord>  keywordList=keyWordService.selectByIds(keywordIdList);
+                result.put("keywordList",keywordList);
+            }
+            //获取私密权限下关联的用户
+            param.clear();
+            if(StringUtils.isNotEmpty(String.valueOf(result.get("authType"))))
+            {
+                if("1".equals(String.valueOf(result.get("authType"))))
+                {
+                    param.put("resourceRecord", req.getParameter("id"));
+                    List<ResourceRecordUserRelate> userRelateList=resourceRecordUserRelateService.allList(param);
+                    result.put("userRelateList",userRelateList);
+                }
             }
         }
 

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/param/coursestudentcollect/CourseStudentCollectAddParam.java

@@ -33,7 +33,6 @@ public class CourseStudentCollectAddParam {
 
     /** 人员id */
     @ApiModelProperty(value = "人员id", position = 2)
-    @NotBlank(message = "人员id不能为空")
     private String userId;
 
     /** 课程id */

snowy-plugin/snowy-plugin-sys/snowy-plugin-sys-func/src/main/java/vip/xiaonuo/sys/modular/user/entity/SysUser.java

@@ -321,21 +321,30 @@ public class SysUser extends CommonEntity {
     @TableField(exist = false,insertStrategy = FieldStrategy.IGNORED, updateStrategy = FieldStrategy.IGNORED)
     private String eduIdentityName;
 
-    /**
-     * 班级id
-     */
+    /** 专业id */
+    @ApiModelProperty(value = "专业id", position = 7)
+    private String majorId;
+
+    /** 专业名称 */
+    @ApiModelProperty(value = "专业名称", position = 7)
+    @TableField(exist = false,insertStrategy = FieldStrategy.IGNORED, updateStrategy = FieldStrategy.IGNORED)
+    private String majorIdName;
+
+    /** 班级id */
+    @ApiModelProperty(value = "班级id", position = 7)
     private String gradesId;
-    /**
-     * 专业id
-     */
-    private Integer majorId;
-    /**
-     * 学号
-     */
+
+    /** 班级名称 */
+    @ApiModelProperty(value = "班级名称", position = 7)
+    @TableField(exist = false,insertStrategy = FieldStrategy.IGNORED, updateStrategy = FieldStrategy.IGNORED)
+    private String gradesIdName;
+
+    /** 学号 */
+    @ApiModelProperty(value = "学号", position = 7)
     private String studentNum;
-    /**
-     * 学届
-     */
+
+    /** 学届 */
+    @ApiModelProperty(value = "学届", position = 7)
     private String fallDue;
 
 

snowy-plugin/snowy-plugin-sys/snowy-plugin-sys-func/src/main/java/vip/xiaonuo/sys/modular/user/mapper/mapping/SysUserMapper.xml

@@ -49,11 +49,19 @@
             IFNULL (t1.COLLEGE_THREE_ID,'') AS collegeThreeId,
             IFNULL (co3.NAME,'') AS collegeThreeIdName,
             IFNULL (CONCAT(t1.COLLEGE_ID,',',t1.COLLEGE_TWO_ID,',',t1.COLLEGE_THREE_ID),'') AS collegeAllId,
-            IFNULL (CONCAT(co1.NAME,',',co2.NAME,',',co3.NAME),'') AS collegeAllIdName
+            IFNULL (CONCAT(co1.NAME,',',co2.NAME,',',co3.NAME),'') AS collegeAllIdName,
+            IFNULL (t1.MAJOR_ID,'') AS majorId,
+            IFNULL (ma.major_name,'') AS majorIdName,
+            IFNULL (t1.GRADES_ID,'') AS gradesId,
+            IFNULL (gr.grades_name,'') AS gradesIdName,
+            IFNULL (t1.STUDENT_NUM ,'') AS studentNum,
+            IFNULL (t1.FALL_DUE  ,'') AS fallDue
         FROM SYS_USER t1
         LEFT JOIN SYS_ORG co1 ON t1.COLLEGE_ID=co1.id AND co1.DELETE_FLAG ='NOT_DELETE'
         LEFT JOIN SYS_ORG co2 ON t1.COLLEGE_TWO_ID=co2.id AND co2.DELETE_FLAG ='NOT_DELETE'
         LEFT JOIN SYS_ORG co3 ON t1.COLLEGE_THREE_ID=co3.id AND co3.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN major ma ON t1.MAJOR_ID=ma.id AND ma.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN grades gr ON t1.GRADES_ID =gr.grades_id  AND gr.DELETE_FLAG ='NOT_DELETE'
         WHERE 1=1
         <if test="id !=null and id != ''">
             AND t1.ID =#{id}

snowy-plugin/snowy-plugin-sys/snowy-plugin-sys-func/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java

@@ -191,8 +191,22 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         SysUser sysUser = this.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getAccount, account));
         if (ObjectUtil.isNotEmpty(sysUser)) {
             transService.transOne(sysUser);
-            return BeanUtil.copyProperties(sysUser, SysLoginUser.class);
+            SysLoginUser sysLoginUser=BeanUtil.copyProperties(sysUser, SysLoginUser.class);
+            Map param=new HashMap<>();
+            param.put("id",sysUser.getId());
+            Map<String,Object> otherInfo=sysUserMapper.getOtherInfo(param);
+            if(ObjectUtil.isNotEmpty(otherInfo))
+            {
+                if(ObjectUtil.isNotEmpty(otherInfo.get("gradesId")))sysLoginUser.setGradesId(String.valueOf(otherInfo.get("gradesId")));
+                if(ObjectUtil.isNotEmpty(otherInfo.get("gradesIdName")))sysLoginUser.setGradesIdName(String.valueOf(otherInfo.get("gradesIdName")));
+                if(ObjectUtil.isNotEmpty(otherInfo.get("majorId")))sysLoginUser.setMajorId(String.valueOf(otherInfo.get("majorId")));
+                if(ObjectUtil.isNotEmpty(otherInfo.get("majorIdName")))sysLoginUser.setMajorIdName(String.valueOf(otherInfo.get("majorIdName")));
+                if(ObjectUtil.isNotEmpty(otherInfo.get("studentNum")))sysLoginUser.setStudentNum(String.valueOf(otherInfo.get("studentNum")));
+                if(ObjectUtil.isNotEmpty(otherInfo.get("fallDue")))sysLoginUser.setFallDue(String.valueOf(otherInfo.get("fallDue")));
+            }
+            return sysLoginUser;
         }
+
         return null;
     }
 
@@ -483,9 +497,19 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         param.put("id",sysUserIdParam.getId());
         //补全其他基础信息
         Map<String,Object> otherInfo=sysUserMapper.getOtherInfo(param);
-        sysUser.setCollegeAllId(otherInfo.get("collegeAllId").toString());
-        sysUser.setCollegeAllIdName(otherInfo.get("collegeAllIdName").toString());
-        sysUser.setEduIdentityName(otherInfo.get("eduIdentityName").toString());
+        if(ObjectUtil.isNotEmpty(otherInfo))
+        {
+            if(ObjectUtil.isNotEmpty(otherInfo.get("collegeAllId")))sysUser.setCollegeAllId(String.valueOf(otherInfo.get("collegeAllId")));
+            if(ObjectUtil.isNotEmpty(otherInfo.get("collegeAllIdName")))sysUser.setCollegeAllIdName(String.valueOf(otherInfo.get("collegeAllIdName")));
+            if(ObjectUtil.isNotEmpty(otherInfo.get("eduIdentityName")))sysUser.setEduIdentityName(String.valueOf(otherInfo.get("eduIdentityName")));
+            if(ObjectUtil.isNotEmpty(otherInfo.get("gradesId")))sysUser.setGradesId(String.valueOf(otherInfo.get("gradesId")));
+            if(ObjectUtil.isNotEmpty(otherInfo.get("gradesIdName")))sysUser.setGradesIdName(String.valueOf(otherInfo.get("gradesIdName")));
+            if(ObjectUtil.isNotEmpty(otherInfo.get("majorId")))sysUser.setMajorId(String.valueOf(otherInfo.get("majorId")));
+            if(ObjectUtil.isNotEmpty(otherInfo.get("majorIdName")))sysUser.setMajorIdName(String.valueOf(otherInfo.get("majorIdName")));
+            if(ObjectUtil.isNotEmpty(otherInfo.get("studentNum")))sysUser.setStudentNum(String.valueOf(otherInfo.get("studentNum")));
+            if(ObjectUtil.isNotEmpty(otherInfo.get("fallDue")))sysUser.setFallDue(String.valueOf(otherInfo.get("fallDue")));
+        }
+
         return sysUser;
     }