Merge branch 'V0.0.1' of http://10.87.10.227:4000/jzyd_yyds/soc into V0.0.1

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/web/domain/PageRequest.java

@@ -10,7 +10,7 @@ public class PageRequest {
 
     private String orgPath;
 
-    private Boolean checkSub;
+    private Boolean checkSub = Boolean.FALSE;
 
     private int page = 0;
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/impl/CoreEduTrainingPlanServiceImpl.java

@@ -179,6 +179,12 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
         if (ObjectUtil.equal(request.getPlanCycle(), 0) && ObjectUtil.hasEmpty(request.getStartDate(), request.getEndDate())) {
             throw new RuntimeException("当计划为无周期的时候,请填入开始时间和结束时间!");
         }
+        Long count = coreEduTrainingPlanMapper.selectCount(new LambdaQueryWrapper<CoreEduTrainingPlan>()
+                .eq(CoreEduTrainingPlan::getPlanName, request.getPlanName())
+                .eq(CoreEduTrainingPlan::getDeleted, 0));
+        if (null != count && count > 0) {
+            throw new RuntimeException("计划名称已存在!");
+        }
         CoreEduTrainingPlan plan = new CoreEduTrainingPlan();
         BeanUtils.copyProperties(request, plan);
         plan.setId(IdWorker.getId());

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/impl/SysLearningMaterialsServiceImpl.java

@@ -4,7 +4,6 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.poi.excel.ExcelUtil;
 import cn.hutool.poi.excel.ExcelWriter;
 import com.alibaba.fastjson2.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -37,7 +36,6 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.net.URLEncoder;
 import java.util.*;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 /**
@@ -62,7 +60,7 @@ public class SysLearningMaterialsServiceImpl extends ServiceImpl<SysLearningMate
         } else {
             page = new Page<>();
         }
-        final List<Long> list = dealParentOrgId(sysLearningMaterials.getOrgId());
+        final List<Long> list = dealParentOrgId(sysLearningMaterials.getOrgId(), true);
         sysLearningMaterials.setOrgIdList(list);
         sysLearningMaterials.setUserId(SecurityUtils.getUserId());
         //获取数据
@@ -79,7 +77,7 @@ public class SysLearningMaterialsServiceImpl extends ServiceImpl<SysLearningMate
         return tableDataInfo;
     }
 
-    private List<Long> dealParentOrgId(Long orgId) {
+    private List<Long> dealParentOrgId(Long orgId, Boolean isNeedRemoveSelf) {
         SysOrg sysOrg = remoteOrgService.selectSysOrgById(orgId, SecurityConstants.INNER);
         if (sysOrg == null || ObjectUtil.isEmpty(sysOrg.getPath())) {
             throw new RuntimeException("机构不存在或机构信息缺失!");
@@ -87,7 +85,9 @@ public class SysLearningMaterialsServiceImpl extends ServiceImpl<SysLearningMate
         String[] split = sysOrg.getPath().split("-");
         List<Long> list = new ArrayList<>();
         Stream.of(split).forEach(s -> list.add(Long.valueOf(s)));
-        //list.remove(sysLearningMaterials.getOrgId());
+        if (isNeedRemoveSelf) {
+            list.remove(orgId);
+        }
         return list;
     }
 
@@ -208,7 +208,7 @@ public class SysLearningMaterialsServiceImpl extends ServiceImpl<SysLearningMate
 
     @Override
     public TableDataInfo filePageList(SysLearningMaterialsFileListPageDto request) {
-        final List<Long> list = dealParentOrgId(request.getOrgId());
+        final List<Long> list = dealParentOrgId(request.getOrgId(), false);
         request.setOrgIdList(list);
         final IPage<SysLearningMaterialsFileListVo> page = sysLearningMaterialsMapper.selectFilePageList(request.getPageRequest(), request);
         final List<SysLearningMaterialsFileListVo> records = page.getRecords();

soc-modules/soc-modules-core/src/main/resources/mapper/edu/SysLearningMaterialsMapper.xml

@@ -112,9 +112,8 @@
         <choose>
             <!-- 查询公开的,需要判断是否关联上级机构,类型与标题 -->
             <when test="request.isOpen != null and request.isOpen ==1">
-                <include refid="pageRequest"/>
                 <if test="request.checkSub==false">
-                    and m.org_id = #{request.orgId}
+                    and m.org_id = #{request.orgId} and m.is_open = 1
                 </if>
                 <if test="request.checkSub==true">
                     or ( m.org_id in

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysUserController.java

@@ -209,19 +209,8 @@ public class SysUserController extends BaseController {
         final String salt = SaltHelper.salt();
         user.setSalt(salt);
         user.setPassword(SaltHelper.exec(user.getPassword(), salt));
+        user.setOriginalOrgId(user.getOrgId());
         userService.insertUser(user);
-//        if (user.getId()!=null&&user.getRoleIds()!=null&&user.getRoleIds().length > 0) {
-//            for (Long roleId :
-//                    user.getRoleIds()) {
-//                SysUserRole sysUserRole = new SysUserRole();
-//                sysUserRole.setUserId(user.getId());
-//                sysUserRole.setRoleId(roleId);
-//                sysUserRoleService.insertSysUserRole(sysUserRole);
-//            }
-//
-//        }
-
-//        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
         return AjaxResult.success();
     }
 
@@ -239,10 +228,7 @@ public class SysUserController extends BaseController {
         } else if (StringUtils.isNotEmpty(user.getPhone()) && !userService.checkPhoneUnique(user)) {
             return error("修改用户'" + user.getUsername() + "'失败，手机号码已存在");
         }
-//        else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user))
-//        {
-//            return error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
-//        }
+
         if (user.getRoleIds() != null && user.getRoleIds().length > 0) {
             sysUserRoleService.remove(new QueryWrapper<SysUserRole>().eq("user_id", user.getId()));
             for (Long roleId :