教育培训任务代码提交

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/enums/edu/EduTrainingType.java

@@ -15,8 +15,8 @@ import java.util.Map;
 public enum EduTrainingType {
 
 
-    AQFFXXJY(0, "每月安全培训教育"),
-    ZBXZHD(1, "专项安全培训教育");
+    MYAQJYPX(0, "每月安全培训教育"),
+    ZXAQJYPX(1, "专项安全培训教育");
 
 
     /**

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

@@ -320,7 +320,6 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
         if (ObjectUtil.equal(plan.getIssue(), 1)) {
             throw new SystemException("计划已完成发布!");
         }
-        Assert.isTrue(ObjectUtil.equal(plan.getIssue(), 1), "计划已完成发布!");
         // 下发 按钮显示逻辑:仅省联社安全保卫管理人员进入且由省联社管理安全保卫人员创建的计划才显示
         //todo 判断当前人的角色信息
 

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

@@ -203,6 +203,13 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
         if (ObjectUtil.equal(request.getSubmitType(), 2)) {
             coreEduTrainingTask.setStatus(EduTrainingDoStatus.WAIT_SIGN.getCode());
         }
+        //判断是否已全部完成签名，如果是将任务修改成已完成
+        Long unSignNums = taskToUserMapper.selectCount(new LambdaQueryWrapper<CoreEduTrainingTaskToUser>()
+                .eq(CoreEduTrainingTaskToUser::getEduTrainingTaskId, request.getId())
+                .eq(CoreEduTrainingTaskToUser::getSign, 0));
+        if (null == unSignNums || unSignNums == 0) {
+            coreEduTrainingTask.setStatus(EduTrainingDoStatus.DONE.getCode());
+        }
 
         coreEduTrainingTask.setUpdateBy(SecurityUtils.getLoginUser().getSysUser().getId().toString());
         coreEduTrainingTask.setUpdateTime(DateUtils.getNowDate());

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

@@ -1,23 +1,25 @@
 package com.xunmei.core.edu.service.impl;
 
-import java.util.Collections;
-import java.util.List;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.domain.IdName;
+import com.xunmei.common.core.domain.edu.domain.SysKnowledge;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.core.utils.StringUtils;
-import com.xunmei.common.core.domain.edu.domain.SysKnowledge;
+import com.xunmei.common.core.web.page.TableDataInfo;
+import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.core.edu.mapper.SysKnowledgeMapper;
 import com.xunmei.core.edu.service.ISysKnowledgeService;
 import com.xunmei.system.api.RemoteOrgService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
 import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 import java.util.stream.Collectors;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.xunmei.common.core.web.page.TableDataInfo;
 
 /**
  * 知识库标签Service业务层处理
@@ -46,6 +48,7 @@ public class SysKnowledgeServiceImpl extends ServiceImpl<SysKnowledgeMapper, Sys
         }
         //查询条件
         LambdaQueryWrapper<SysKnowledge> wrapper = new LambdaQueryWrapper<>(sysKnowledge);
+        wrapper.orderByAsc(SysKnowledge::getCreateTime);
         //模糊查询
         if (StringUtils.isNotNull(sysKnowledge.getName())) {
             wrapper.like(SysKnowledge::getName, sysKnowledge.getName());
@@ -96,6 +99,9 @@ public class SysKnowledgeServiceImpl extends ServiceImpl<SysKnowledgeMapper, Sys
     @Override
     public int insertSysKnowledge(SysKnowledge sysKnowledge) {
         sysKnowledge.setCreateTime(DateUtils.getNowDate());
+        sysKnowledge.setUpdateTime(DateUtils.getNowDate());
+        sysKnowledge.setCreateBy(SecurityUtils.getUserId().toString());
+        sysKnowledge.setUpdateBy(SecurityUtils.getUserId().toString());
         return sysKnowledgeMapper.insert(sysKnowledge);
     }
 
@@ -107,6 +113,7 @@ public class SysKnowledgeServiceImpl extends ServiceImpl<SysKnowledgeMapper, Sys
      */
     @Override
     public int updateSysKnowledge(SysKnowledge sysKnowledge) {
+        sysKnowledge.setUpdateBy(SecurityUtils.getUserId().toString());
         sysKnowledge.setUpdateTime(DateUtils.getNowDate());
         return sysKnowledgeMapper.updateById(sysKnowledge);
     }

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

@@ -139,11 +139,13 @@
                     and m.org_id = #{request.orgId}
                 </if>
                 <if test="request.checkSub==true">
-                    or ( m.org_id in
-                    <foreach collection="request.orgIdList" item="item" open="(" separator="," close=")">
-                        #{item}
-                    </foreach>
-                    and m.is_open = 1
+                    or ( m.is_open = 1
+                    <if test="request.orgIdList.size>0">
+                        and m.org_id in
+                        <foreach collection="request.orgIdList" item="item" open="(" separator="," close=")">
+                            #{item}
+                        </foreach>
+                    </if>
                     <include refid="pageRequest"/>)
                 </if>
             </otherwise>

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysMenuServiceImpl.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.constant.Constants;
 import com.xunmei.common.core.constant.UserConstants;
 import com.xunmei.common.core.utils.StringUtils;
-import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.system.api.domain.SysRole;
 import com.xunmei.system.api.domain.SysUser;
 import com.xunmei.system.domain.SysMenu;
@@ -115,7 +114,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
     @Override
     public List<SysMenu> selectMenuTreeByUserId(Long userId, String platformType) {
         List<SysMenu> menus = null;
-        if (SecurityUtils.isAdmin(userId)) {
+        if (true) {
             menus = menuMapper.selectMenuTreeAll(platformType);
         } else {
             menus = menuMapper.selectMenuTreeByUserId(userId, platformType);

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysPermissionServiceImpl.java

@@ -60,15 +60,11 @@ public class SysPermissionServiceImpl implements ISysPermissionService
     {
         Set<String> perms = new HashSet<String>();
         // 管理员拥有所有权限
-        if (user.isAdmin())
-        {
+        if (true) {
             perms.add("*:*:*");
-        }
-        else
-        {
+        } else {
             List<SysRole> roles = user.getRoles();
-            if (!CollectionUtils.isEmpty(roles))
-            {
+            if (!CollectionUtils.isEmpty(roles)) {
                 // 多角色设置permissions属性，以便数据权限匹配权限
                 for (SysRole role : roles)
                 {