下发代码修改

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/service/impl/CollegeUserServiceImpl.java

@@ -42,6 +42,7 @@ import vip.xiaonuo.common.enums.CommonSortOrderEnum;
 import vip.xiaonuo.common.exception.CommonException;
 import vip.xiaonuo.common.page.CommonPageRequest;
 import vip.xiaonuo.common.pojo.CommonResult;
+import vip.xiaonuo.common.util.CommonCryptogramUtil;
 import vip.xiaonuo.disk.domain.CollegeUser;
 import vip.xiaonuo.disk.domain.Dept;
 import vip.xiaonuo.disk.mapper.CollegeUserMapper;
@@ -51,6 +52,7 @@ import vip.xiaonuo.disk.param.collegeUser.CollegeUserIdParam;
 import vip.xiaonuo.disk.param.collegeUser.CollegeUserPageParam;
 import vip.xiaonuo.disk.service.CollegeUserService;
 import vip.xiaonuo.disk.util.HttpRequest;
+import vip.xiaonuo.sys.modular.org.mapper.SysOrgMapper;
 import vip.xiaonuo.sys.modular.user.entity.SysUser;
 import vip.xiaonuo.sys.modular.user.mapper.SysUserMapper;
 
@@ -95,6 +97,10 @@ public class CollegeUserServiceImpl extends ServiceImpl<CollegeUserMapper, Colle
     @Resource
     private  SysUserMapper sysUserMapper;
 
+
+    @Resource
+    private SysOrgMapper sysOrgMapper;
+
     @Resource(name = "loginUserApi")
     private SaBaseLoginUserApi loginUserApi;
     @Override
@@ -134,8 +140,8 @@ public class CollegeUserServiceImpl extends ServiceImpl<CollegeUserMapper, Colle
             //如果用户存在,则进行更新
             if(ObjectUtil.isNotEmpty(sysUser)){
                 if(CollectionUtil.isNotEmpty(collegeUserAddParam.getPost())){
-                    @NotNull List<String> depIds = collegeUserAddParam.getPost().stream().map(Dept::getDeptId).collect(Collectors.toList());
-                    String result = String.join(",", depIds);
+                    @NotNull List<String> deptIds = collegeUserAddParam.getPost().stream().map(Dept::getDeptId).collect(Collectors.toList());
+                    String result = String.join(",", deptIds);
                     sysUser.setOrgId(result);   //组织id
                 }
 
@@ -144,8 +150,17 @@ public class CollegeUserServiceImpl extends ServiceImpl<CollegeUserMapper, Colle
                 sysUser.setName(collegeUser.getCallName());  //昵称
                 sysUser.setEmail(collegeUser.getEmail());    //邮箱
                 sysUser.setPhone(collegeUser.getMobile());    //电话
-                sysUser.setEduIdentity("1");      //身份认证
-                sysUser.setPassword("123456");
+                List<String> deptIds = collegeUserAddParam.getPost().stream().map(Dept::getDeptId).collect(Collectors.toList());
+                //根据组织id查询组织名称
+                if(CollectionUtil.isNotEmpty(deptIds)){
+                    List<String> orgNameList=sysOrgMapper.selectOrgNameList(deptIds);
+                    if(CollectionUtil.isNotEmpty(orgNameList)&&orgNameList.contains("学生")){
+                        sysUser.setEduIdentity("2");    //学生
+                    }else{
+                        sysUser.setEduIdentity("1");    //老师
+                    }
+                }
+                sysUser.setPassword(CommonCryptogramUtil.doHashValue("123456"));
                 if("0".equals(collegeUser.getSex())){    //性别
                     sysUser.setGender("男");
                 }else if("1".equals(collegeUser.getSex())){
@@ -167,10 +182,9 @@ public class CollegeUserServiceImpl extends ServiceImpl<CollegeUserMapper, Colle
                 //如果用户存在,进行插入
                 SysUser user =new SysUser();
                 user.setId(IdUtil.getSnowflakeNextIdStr());
-
                 if(CollectionUtil.isNotEmpty(collegeUserAddParam.getPost())){
-                    @NotNull List<String> depIds = collegeUserAddParam.getPost().stream().map(Dept::getDeptId).collect(Collectors.toList());
-                    String result = String.join(",", depIds);
+                    @NotNull List<String> deptIds = collegeUserAddParam.getPost().stream().map(Dept::getDeptId).collect(Collectors.toList());
+                    String result = String.join(",", deptIds);
                     user.setOrgId(result);   //组织id
                 }
                 user.setUserCode(collegeUser.getUserCode());
@@ -178,8 +192,16 @@ public class CollegeUserServiceImpl extends ServiceImpl<CollegeUserMapper, Colle
                 user.setName(collegeUser.getCallName());
                 user.setEmail(collegeUser.getEmail());
                 user.setPhone(collegeUser.getMobile());
-                user.setPassword("123456");
-                user.setEduIdentity("1");
+                user.setPassword(CommonCryptogramUtil.doHashValue("123456"));
+                List<String> deptIds = collegeUserAddParam.getPost().stream().map(Dept::getDeptId).collect(Collectors.toList());
+                if(CollectionUtil.isNotEmpty(deptIds)){
+                    List<String> orgNameList=sysOrgMapper.selectOrgNameList(deptIds);
+                    if(CollectionUtil.isNotEmpty(orgNameList)&&orgNameList.contains("学生")){
+                        user.setEduIdentity("2");    //学生
+                    }else{
+                        user.setEduIdentity("1");    //老师
+                    }
+                }
                 if("0".equals(collegeUser.getSex())){
                     user.setGender("男");
                 }else if("1".equals(collegeUser.getSex())){

snowy-plugin/snowy-plugin-sys/snowy-plugin-sys-func/src/main/java/vip/xiaonuo/sys/modular/org/mapper/SysOrgMapper.java

@@ -54,4 +54,6 @@ public interface SysOrgMapper extends BaseMapper<SysOrg> {
      * （用于补全信息）
      * */
     List<Map<String,Object>> getOtherInfoList(Map param);
+
+    List<String> selectOrgNameList(@Param("deptIds") List<String> deptIds);
 }

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

@@ -58,4 +58,11 @@
         </if>
     </select>
 
+    <select id="selectOrgNameList" resultType="string">
+          select NAME from SYS_ORG where  DELETE_FLAG = 'NOT_DELETE' and id in
+          <foreach collection="deptIds" item="deptId" open="(" close=")" separator=",">
+              #{deptId}
+          </foreach>
+    </select>
+
 </mapper>