1.系统人员更新时也加入教育身份绑定角色

2.获取通用未读数量，站内信加入类型检索

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

@@ -156,6 +156,7 @@ public class UserReadController {
         //功能类型，1站内信2公告
         String funcType=req.getParameter("funcType");
         param.put("funcType", funcType);
+        param.put("category", req.getParameter("category"));
         param.put("userId", StpLoginUserUtil.getLoginUser().getId());
         Map<String,Object> result=userReadService.getCount(param);
         return CommonResult.data(result);

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/mapping/UserReadMapper.xml

@@ -12,6 +12,9 @@
         <if test="userId !=null and userId != ''">
             AND dr.TARGET_ID=#{userId}
         </if>
+        <if test="category !=null and category != ''">
+            AND dr.CATEGORY=#{category}
+        </if>
     </select>
 
     <select id="getNoticeCount" resultType="java.util.Map">

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

@@ -468,6 +468,18 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         if(updateSuperAdminAccount) {
             throw new CommonException("不可修改系统内置超管用户账号");
         }
+
+        //判断教育身份，如果是学生或者老师直接关联对应角色
+        String roleId="";
+        if(sysUserEditParam.getEduIdentity().equals("1")||sysUserEditParam.getEduIdentity().equals("2")) {
+            if (sysUserEditParam.getEduIdentity().equals("1")) {
+                roleId = "102";
+            } else if (sysUserEditParam.getEduIdentity().equals("2")) {
+                roleId = "103";
+            }
+        }
+        sysRelationService.saveRelationWithAppend(sysUser.getId(),roleId,SysRelationCategoryEnum.SYS_USER_HAS_ROLE.getValue());
+
         BeanUtil.copyProperties(sysUserEditParam, sysUser);
         this.updateById(sysUser);