Merge remote-tracking branch 'origin/V0.0.1' into V0.0.1

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/access/service/impl/TMonitoringRetrievalPlanServiceImpl.java

@@ -22,6 +22,7 @@ import com.xunmei.system.api.domain.SysUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
+
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
@@ -36,8 +37,8 @@ import java.util.List;
 @Lazy
 @Service
 public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoringRetrievalPlanMapper, TMonitoringRetrievalPlan> implements ITMonitoringRetrievalPlanService {
-    private static final Long MINUS_ONE = -1L;
-    private static final Long ZERO = 0L;
+    private static final Integer MINUS_ONE = -1;
+    private static final Integer ZERO = 0;
     @Autowired
     private TMonitoringRetrievalPlanMapper tMonitoringRetrievalPlanMapper;
     @Autowired
@@ -53,7 +54,7 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
     @Override
     public TableDataInfo<TMonitoringRetrievalPlan> selectPage(TMonitoringRetrievalPlan tMonitoringRetrievalPlan) {
         //未删除
-        tMonitoringRetrievalPlan.setIsDeleted(ZERO);
+        tMonitoringRetrievalPlan.setIsDeleted(ZERO.longValue());
         Page<TMonitoringRetrievalPlan> page;
         //分页
         if (tMonitoringRetrievalPlan.getPageNum() != null && tMonitoringRetrievalPlan.getPageSize() != null) {
@@ -68,7 +69,7 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
         QueryWrapper<TMonitoringRetrievalPlan> query = new QueryWrapper<>(tMonitoringRetrievalPlan);
         //下穿
         tMonitoringRetrievalPlan.setCheckSub(true);
-        List<SysOrg> data = remoteOrgService.selectSysOrgByParentId(MINUS_ONE, SecurityConstants.INNER);
+        List<SysOrg> data = remoteOrgService.selectSysOrgByParentId(MINUS_ONE.longValue(), SecurityConstants.INNER);
         if (null == tMonitoringRetrievalPlan.getOrgId()) {
             tMonitoringRetrievalPlan.setOrgId(data.get(0).getId());
         }
@@ -112,10 +113,10 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
     public int distribute(Long id) {
         //查询
         TMonitoringRetrievalPlan tMonitoringRetrievalPlan = tMonitoringRetrievalPlanMapper.selectById(id);
-        tMonitoringRetrievalPlan.setPlanStatus(0);
+        tMonitoringRetrievalPlan.setPlanStatus(ZERO);
         tMonitoringRetrievalPlanMapper.updateById(tMonitoringRetrievalPlan);
-        List<SysOrg> list = remoteOrgService.selectSysOrgByParentId(MINUS_ONE, SecurityConstants.INNER);
-        Integer i = 0;
+        List<SysOrg> list = remoteOrgService.selectSysOrgByParentId(MINUS_ONE.longValue(), SecurityConstants.INNER);
+        Integer i = ZERO;
         List<TMonitoringRetrievalPlan> tMonitoringRetrievalPlans = new ArrayList<>();
         for (SysOrg l : list) {
             TMonitoringRetrievalPlan monitoringRetrievalPlan = new TMonitoringRetrievalPlan();
@@ -129,20 +130,21 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
             monitoringRetrievalPlan.setRoleId(tMonitoringRetrievalPlan.getRoleId());
             monitoringRetrievalPlan.setPlanCycle(tMonitoringRetrievalPlan.getPlanCycle());
             monitoringRetrievalPlan.setPlanFrequency(tMonitoringRetrievalPlan.getPlanFrequency());
-            monitoringRetrievalPlan.setPlanStatus(0);
+            monitoringRetrievalPlan.setPlanStatus(ZERO);
             monitoringRetrievalPlan.setCreateBy(SecurityUtils.getUsername());
             monitoringRetrievalPlan.setUpdateTime(DateUtils.getNowDate());
             monitoringRetrievalPlan.setUpdateBy(SecurityUtils.getUsername());
             monitoringRetrievalPlan.setCreateTime(DateUtils.getNowDate());
             monitoringRetrievalPlan.setDescription(tMonitoringRetrievalPlan.getDescription());
             monitoringRetrievalPlan.setCreateType(1);
+            monitoringRetrievalPlan.setId(IdWorker.getId());
             i = tMonitoringRetrievalPlanMapper.insert(monitoringRetrievalPlan);
             tMonitoringRetrievalPlans.add(monitoringRetrievalPlan);
-            if (i < 0) {
+            if (i < ZERO) {
                 return i;
             }
         }
-        if (tMonitoringRetrievalPlan.getPlanCycle().equals("0")) {
+        if (tMonitoringRetrievalPlan.getPlanCycle().equals(ZERO.toString())) {
             iCoreMonitoringRetrievalTaskService.noCycleTask(tMonitoringRetrievalPlans);
         }
         return i;
@@ -177,20 +179,21 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
         tMonitoringRetrievalPlan.setUpdateBy(SecurityUtils.getUsername());
         SysRole sysRole = remoteRoleService.getRoleById(tMonitoringRetrievalPlan.getRoleId(), SecurityConstants.INNER);
         tMonitoringRetrievalPlan.setRoleName(sysRole.getRoleName());
+        long id = IdWorker.getId();
+        tMonitoringRetrievalPlan.setId(id);
         if (tMonitoringRetrievalPlan.getOrgType().equals("1")) {
             tMonitoringRetrievalPlan.setPlanStatus(1);
-            tMonitoringRetrievalPlan.setCreateType(0);
+            tMonitoringRetrievalPlan.setCreateType(ZERO);
         } else {
-            tMonitoringRetrievalPlan.setPlanStatus(0);
+            tMonitoringRetrievalPlan.setPlanStatus(ZERO);
             tMonitoringRetrievalPlan.setCreateType(1);
             //无周期调用
-            if (tMonitoringRetrievalPlan.getPlanCycle().equals("0")) {
+            if (tMonitoringRetrievalPlan.getPlanCycle().equals(ZERO.toString())) {
                 List<TMonitoringRetrievalPlan> tMonitoringRetrievalPlans = new ArrayList<>();
                 tMonitoringRetrievalPlans.add(tMonitoringRetrievalPlan);
                 iCoreMonitoringRetrievalTaskService.noCycleTask(tMonitoringRetrievalPlans);
             }
         }
-        tMonitoringRetrievalPlan.setId(IdWorker.getId());
         return tMonitoringRetrievalPlanMapper.insert(tMonitoringRetrievalPlan);
     }
 
@@ -214,7 +217,7 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
      */
     @Override
     public int deleteTMonitoringRetrievalPlanByIds(Long[] ids) {
-        int i = 0;
+        int i = ZERO;
         for (Long id : ids) {
             TMonitoringRetrievalPlan tMonitoringRetrievalPlan = new TMonitoringRetrievalPlan();
             tMonitoringRetrievalPlan.setIsDeleted(2L);

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/java/com/xunmei/core/resumption/domain/AppRule.java

@@ -46,7 +46,7 @@ public class AppRule extends BaseEntity {
 
     @ApiModelProperty(value = "0:禁用 1:启用")
     @TableField("status")
-    private Integer status;
+    private String status;
 
     @ApiModelProperty(value = "备注")
     @TableField("remark")

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/dto/appRule/AppRuleEditDto.java

@@ -31,9 +31,9 @@ public class AppRuleEditDto {
     @NotNull(message = "受检机构类型不能为空")
     private String orgType;
 
-    @ApiModelProperty(value = "0:禁用 1:启用")
+    @ApiModelProperty(value = "状态")
     @NotBlank(message = "状态不能为空")
-    private int status;
+    private String status;
 
     @ApiModelProperty(value = "备注")
     private String remark;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/dto/appRule/AppRulePageDto.java

@@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.xunmei.common.core.web.domain.PageDto;
 import com.xunmei.core.resumption.vo.appRule.AppRulePageVo;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
+@Data
 public class AppRulePageDto extends PageDto<AppRulePageVo> {
     @ApiModelProperty(value = "履职内容库名称")
     private String name;
@@ -15,7 +17,8 @@ public class AppRulePageDto extends PageDto<AppRulePageVo> {
     @ApiModelProperty(value = "履职机构类型")
     private String orgType;
 
-    @TableField(exist = false)
+    private Long orgId;
+
     @ApiModelProperty(value = "是否下穿查询")
     private Boolean checkSub = false;
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/impl/AppPlanServiceImpl.java

@@ -455,12 +455,12 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
         QueryWrapper<AppRule> qw = new QueryWrapper<>();
 
         if (info.getOrgType() != null) {
-            qw.lambda().eq(AppRule::getOrgType, info.getOrgType()).eq(AppRule::getStatus, 0);
+            qw.lambda().eq(AppRule::getOrgType, info.getOrgType()).eq(AppRule::getStatus, "0");
         }
 
         if (info.getOrgId() != null) {
             SysOrg org = orgService.selectSysOrgById(info.getOrgId(), SecurityConstants.INNER);
-            qw.lambda().eq(AppRule::getOrgType, org.getType()).eq(AppRule::getStatus, 0);
+            qw.lambda().eq(AppRule::getOrgType, org.getType()).eq(AppRule::getStatus, "0");
         }
 
         List<AppRule> appRules = appRuleMapper.selectList(qw);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/impl/AppRuleServiceImpl.java

@@ -108,7 +108,7 @@ public class AppRuleServiceImpl extends ServiceImpl<AppRuleMapper, AppRule> impl
         List<AppRule> rules = appRuleMapper.selectList(new LambdaQueryWrapper<AppRule>()
                 .in(AppRule::getOrgId, upOrgIds)
                 .eq(AppRule::getOrgType, dto.getOrgType())
-                .eq(AppRule::getStatus, 0)
+                .eq(AppRule::getStatus, "0")
                 .select(AppRule::getId, AppRule::getName)
         );
         List<IdNameVo> list = rules.stream().map(r -> {

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/vo/appRule/AppRuleInfoVo.java

@@ -31,7 +31,7 @@ public class AppRuleInfoVo {
     private String orgType;
 
     @ApiModelProperty("状态")
-    private Integer status;
+    private String status;
 
     @ApiModelProperty("备注")
     private String remark;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/vo/appRule/AppRulePageVo.java

@@ -30,8 +30,8 @@ public class AppRulePageVo {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long orgId;
 
-    @ApiModelProperty(value = "0:禁用 1:启用")
-    private Integer status;
+    @ApiModelProperty(value = "状态")
+    private String status;
 
     @ApiModelProperty(value = "备注")
     private String remark;

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-core/src/main/resources/mapper/resumption/AppRuleMapper.xml

@@ -36,7 +36,7 @@
                r.org_type as orgTypeId
         from core_resumption_rule r
                  inner join sys_dict_data d on r.type = d.id and d.dict_code = 'sys_org_type'
-        where status = 0
+        where status = "0"
     </select>
 
     <!--    <select id="get" resultType="com.xunmei.core.resumption.vo.appRule.AppRuleInfoVo">-->

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

@@ -19,6 +19,7 @@ import com.xunmei.system.api.domain.SysUserInformation;
 import com.xunmei.system.api.model.LoginUser;
 import com.xunmei.system.domain.SysUserRole;
 import com.xunmei.system.domain.vo.SysUserListVo;
+import com.xunmei.system.domain.vo.UserRoleVo;
 import com.xunmei.system.service.*;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.ArrayUtils;
@@ -26,6 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+
 import java.util.Date;
 import java.util.List;
 import java.util.Set;
@@ -138,9 +140,12 @@ public class SysUserController extends BaseController {
         Set<String> roles = permissionService.getRolePermission(user);
         // 权限集合
         Set<String> permissions = permissionService.getMenuPermission(user);
+        List<UserRoleVo> userRoleVos = sysUserRoleService.selectUserRoleVoList(user.getId());
         AjaxResult ajax = AjaxResult.success();
         ajax.put("user", user);
         ajax.put("roles", roles);
+        //用户角色信息
+        ajax.put("roleList", userRoleVos);
         ajax.put("permissions", permissions);
         return ajax;
     }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/domain/vo/UserRoleVo.java

@@ -0,0 +1,11 @@
+package com.xunmei.system.domain.vo;
+
+import lombok.Data;
+
+@Data
+public class UserRoleVo {
+
+    private Long userId;
+    private Long roleId;
+    private String roleName;
+}

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/mapper/SysUserRoleMapper.java

@@ -1,8 +1,8 @@
 package com.xunmei.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xunmei.system.domain.SysUserPost;
 import com.xunmei.system.domain.SysUserRole;
+import com.xunmei.system.domain.vo.UserRoleVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -53,14 +53,16 @@ public interface SysUserRoleMapper extends BaseMapper<SysUserRole>
      * @param userRole 用户和角色关联信息
      * @return 结果
      */
-     int deleteUserRoleInfo(SysUserRole userRole);
+    int deleteUserRoleInfo(SysUserRole userRole);
 
     /**
      * 批量取消授权用户角色
-     * 
-     * @param roleId 角色ID
+     *
+     * @param roleId  角色ID
      * @param userIds 需要删除的用户数据ID
      * @return 结果
      */
-     int deleteUserRoleInfos(@Param("roleId") Long roleId, @Param("userIds") Long[] userIds);
+    int deleteUserRoleInfos(@Param("roleId") Long roleId, @Param("userIds") Long[] userIds);
+
+    List<UserRoleVo> selectUserRoleVoList(@Param("userId") Long userId);
 }

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

@@ -1,11 +1,11 @@
 package com.xunmei.system.service;
 
-import java.util.List;
-
-import com.xunmei.system.domain.SysUserRole;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xunmei.common.core.web.page.TableDataInfo;
+import com.xunmei.system.domain.SysUserRole;
+import com.xunmei.system.domain.vo.UserRoleVo;
+
+import java.util.List;
 
 /**
  * 用户和角色关联Service接口
@@ -75,4 +75,6 @@ public interface ISysUserRoleService extends IService<SysUserRole> {
      * @return Page
      */
     TableDataInfo<SysUserRole> selectPage(SysUserRole sysUserRole);
+
+    List<UserRoleVo> selectUserRoleVoList(Long userId);
 }

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)
                 {

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

@@ -1,15 +1,17 @@
 package com.xunmei.system.service.impl;
 
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.web.page.TableDataInfo;
-import com.xunmei.system.mapper.SysUserRoleMapper;
 import com.xunmei.system.domain.SysUserRole;
+import com.xunmei.system.domain.vo.UserRoleVo;
+import com.xunmei.system.mapper.SysUserRoleMapper;
 import com.xunmei.system.service.ISysUserRoleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * 用户和角色关联Service业务层处理
@@ -25,9 +27,9 @@ public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleMapper, SysUs
     @Override
     public TableDataInfo<SysUserRole> selectPage(SysUserRole sysUserRole) {
         Page<SysUserRole> page;
-        if (sysUserRole.getPageNum() != null &&sysUserRole.getPageSize() != null){
+        if (sysUserRole.getPageNum() != null && sysUserRole.getPageSize() != null) {
             page = new Page<>(sysUserRole.getPageNum(), sysUserRole.getPageSize());
-        }else{
+        } else {
             page = new Page<>();
         }
         QueryWrapper<SysUserRole> where = new QueryWrapper<>(sysUserRole);
@@ -36,6 +38,11 @@ public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleMapper, SysUs
 
     }
 
+    @Override
+    public List<UserRoleVo> selectUserRoleVoList(Long userId) {
+
+        return sysUserRoleMapper.selectUserRoleVoList(userId);
+    }
 
     /**
      * 查询用户和角色关联
@@ -73,7 +80,7 @@ public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleMapper, SysUs
      */
     @Override
     public int insertSysUserRole(SysUserRole sysUserRole) {
-            return sysUserRoleMapper.insert(sysUserRole);
+        return sysUserRoleMapper.insert(sysUserRole);
     }
 
     /**

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysUserRoleMapper.xml

@@ -31,15 +31,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			(#{item.userId},#{item.roleId},#{item.createBy},#{item.createTime})
 		</foreach>
 	</insert>
-	
+
 	<delete id="deleteUserRoleInfo" parameterType="com.xunmei.system.domain.SysUserRole">
-		delete from sys_user_role where user_id=#{userId} and role_id=#{roleId}
+		delete
+		from sys_user_role
+		where user_id = #{userId}
+		  and role_id = #{roleId}
 	</delete>
-	
+
 	<delete id="deleteUserRoleInfos">
-	    delete from sys_user_role where role_id=#{roleId} and user_id in
- 	    <foreach collection="userIds" item="userId" open="(" separator="," close=")">
- 	        #{userId}
-            </foreach> 
+		delete from sys_user_role where role_id=#{roleId} and user_id in
+		<foreach collection="userIds" item="userId" open="(" separator="," close=")">
+			#{userId}
+		</foreach>
 	</delete>
+
+	<select id="selectUserRoleVoList" resultType="com.xunmei.system.domain.vo.UserRoleVo">
+		select ur.user_id as userId, r.id as roleId, r.role_name as roleName
+		from sys_user_role ur
+				 inner join sys_role r on ur.role_id = r.id
+		where ur.user_id = #{userId}
+		  and r.del_flag = 0
+	</select>
 </mapper>