Merge remote-tracking branch 'origin/master'

authentication/src/main/java/com/jzg/config/JzgAuthenticationProvider.java

@@ -1,6 +1,7 @@
 package com.jzg.config;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.jzg.commons.constants.SystemConstants;
 import com.jzg.commons.entity.po.SysRoleDataScope;
 import com.jzg.commons.entity.po.SysRoleDataScopeLink;
 import com.jzg.commons.entity.vo.SysRoleDataScopeVo;
@@ -103,7 +104,7 @@ public class JzgAuthenticationProvider implements AuthenticationProvider {
                 .in(SysRoleDataScope::getRoleId, roleIds));
         //设置角色数据权限
         SysRoleDataScopeVo sysRoleDataScopeVo = new SysRoleDataScopeVo();
-        if(!username.equals("admin")) {
+        if(!username.equals("admin") && !SystemConstants.SYSTEM_PLATFORM.getCode().equals(system)) {
 
             String dataMark = "";
             List<String> dataDeptIds = new ArrayList<>();

commons/src/main/java/com/jzg/commons/entity/po/SysUserPlateInfo.java

@@ -3,6 +3,7 @@ package com.jzg.commons.entity.po;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.jzg.commons.constants.SystemConstants;
 import com.jzg.commons.core.base.BaseModel;
 import com.jzg.commons.entity.enums.YesNoEnum;
@@ -21,24 +22,24 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @AllArgsConstructor
 public class SysUserPlateInfo extends BaseModel {
-    /**
-     * 
-     */
+
+    @TableField(value = "id")
+    @Schema(description = "主键id")
     private String id;
 
-    /**
-     * 用户id
-     */
+    /** 用户id */
+    @TableField(value = "user_id")
+    @Schema(description = "用户id")
     private String userId;
 
-    /**
-     * 系统code
-     */
+    /** 系统code */
+    @TableField(value = "system_code")
+    @Schema(description = "系统code")
     private String systemCode;
 
-    /**
-     * 是否启用 1 启用 0禁用
-     */
+    /** 是否启用 1 启用 0禁用 */
+    @TableField(value = "is_enable")
+    @Schema(description = "是否启用 1 启用 0禁用")
     private Integer isEnable;
 
     /**

commons/src/main/java/com/jzg/commons/entity/po/SysUserRole.java

@@ -1,16 +1,32 @@
 package com.jzg.commons.entity.po;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.jzg.commons.core.base.BaseModel;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
+@Schema(description = "用户信息表实体")
 @Data
-public class SysUserRole {
+@NoArgsConstructor
+@AllArgsConstructor
+public class SysUserRole extends BaseModel {
 
+    @TableField(value = "id")
+    @Schema(description = "主键id")
     private String id;
 
+    @TableField(value = "user_id")
+    @Schema(description = "用户id")
     private String userId;
 
+    @TableField(value = "role_id")
+    @Schema(description = "角色id")
     private String roleId;
 
+    @TableField(exist = false)
+    @Schema(description = "角色名称")
     private String name;
 
 }

platform/src/main/java/com/jzg/service/SysSystemService.java

@@ -130,17 +130,10 @@ public interface SysSystemService extends IService<SysSystem> {
 
     /**
      * 判断租户是否关联子机构
-     * @param sysSystemVo
-     * @return
-     */
-    String sysDeleteValid(List<String> ids);
-
-    /**
-     * 判断租户下是否有成员信息
      * @param ids
      * @return
      */
-    boolean sysDeleteValidUser(List<String> ids);
+    String sysDeleteValid(List<String> ids);
 
     /**
      * 批量删除租户

platform/src/main/java/com/jzg/service/impl/SysSystemServiceImpl.java

@@ -250,7 +250,7 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
         }
         // 关联用户角色
         SysUserRole userRole = new SysUserRole();
-        userRole.setUserId(info.getId());
+        userRole.setUserId(userId);
         userRole.setRoleId(role.getId());
         sysUserRoleMapper.insert(userRole);
         // 租户绑定管理员信息
@@ -341,29 +341,21 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
                     errorStr = "租户["+sysSystem.getSysName()+"]还有部分子机构，请将这些子机构删除后，再进行删除！";
                     return errorStr;
                 }
-                if(CollUtil.isNotEmpty(deptIdList)){
-                    Long count = sysUserJzgInfoMapper.selectCount(new LambdaQueryWrapper<SysUserJzgInfo>()
-                            .in(SysUserJzgInfo::getDeptId, deptIdList));
-                    if(count > 0){
-                        errorStr = "租户["+sysSystem.getSysName()+"]还有部分员工，请将这些员工变更机构或者删除后，再进行删除！";
-                        return errorStr;
-                    }
+
+                Long count = sysUserPlateInfoMapper.selectCount(new LambdaQueryWrapper<SysUserPlateInfo>()
+                        .eq(SysUserPlateInfo::getSystemCode, sysSystem.getSysCode())
+                        .eq(SysUserPlateInfo::getIsEnable, 1)
+                        .eq(SysUserPlateInfo::getIsDelete, 0));
+
+                if(count > 0){
+                    errorStr = "租户["+sysSystem.getSysName()+"]还有部分员工，请将这些员工变更机构或者删除后，再进行删除！";
+                    return errorStr;
                 }
             }
         }
         return errorStr;
     }
 
-    @Override
-    public boolean sysDeleteValidUser(List<String> ids) {
-        Long count = sysUserJzgInfoMapper.selectCount(new LambdaQueryWrapper<SysUserJzgInfo>()
-                .in(SysUserJzgInfo::getUserId, ids));
-        if(count <= 0){
-            return true;
-        }
-        return false;
-    }
-
     @Override
     public boolean deleteByIds(List<String> ids) {
         return baseMapper.deleteByIds(ids) > 0;

platform/src/main/java/com/jzg/service/impl/SysUserServiceImpl.java

@@ -49,14 +49,14 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
         Page<SysUserVo> userPage = baseMapper.queryPage(page, param);
         List<SysUserVo> userList = userPage.getRecords();
         if (!userList.isEmpty()) {
-            List<String> userIdList = userList.stream().map(user -> user.getUserInfoId()).collect(Collectors.toList());
+            List<String> userIdList = userList.stream().map(user -> user.getId()).collect(Collectors.toList());
             // 批量查询 角色信息
             List<SysUserRole> roleIds  = sysRoleMapper.queryByUserIds(userIdList);
             Map<String,List<SysUserRole>> nameMap = roleIds.stream()
                     .collect(Collectors.groupingBy(SysUserRole::getUserId));
             userList.forEach(sysUser -> {
-                if(nameMap.containsKey(sysUser.getUserInfoId())){
-                    sysUser.setRoleNameList(nameMap.get(sysUser.getUserInfoId()).stream()
+                if(nameMap.containsKey(sysUser.getId())){
+                    sysUser.setRoleNameList(nameMap.get(sysUser.getId()).stream()
                             .map(SysUserRole::getName).collect(Collectors.toList()));
                 }
             });
@@ -76,12 +76,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
             vo.setIsEnable(infos.get(0).getIsEnable());
         }
         List<String> userIdList = new ArrayList<>();
-        userIdList.add(infos.get(0).getId());
+        userIdList.add(user.getId());
         // 批量查询 角色信息
         List<SysUserRole> roleIds  = sysRoleMapper.queryByUserIds(userIdList);
         Map<String,List<SysUserRole>> nameMap = roleIds.stream()
                 .collect(Collectors.groupingBy(SysUserRole::getUserId));
-        vo.setRoleNameList(nameMap.get(infos.get(0).getId()).stream()
+        vo.setRoleNameList(nameMap.get(user.getId()).stream()
                 .map(SysUserRole::getName).collect(Collectors.toList()));
         return vo;
     }
@@ -135,7 +135,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
         List<SysUserRole> userRoles = new ArrayList<>();
         for (String id : roleIdList) {
             SysUserRole sysUserRole = new SysUserRole();
-            sysUserRole.setUserId(info.getId());
+            sysUserRole.setUserId(user.getId());
             sysUserRole.setRoleId(id);
             userRoles.add(sysUserRole);
         }
@@ -162,7 +162,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
         List<SysUserRole> userRoles = new ArrayList<>();
         roleList.forEach(id -> {
             SysUserRole sysUserRole = new SysUserRole();
-            sysUserRole.setUserId(info.getId());
+            sysUserRole.setUserId(user.getId());
             sysUserRole.setRoleId(id);
             userRoles.add(sysUserRole);
         });

platform/src/main/resources/mapper/SysUserMapper.xml

@@ -29,7 +29,7 @@
         SELECT sr.id,sr.username,sr.password,
         sr.salt,sr.mobile,sr.account_status,
         sr.create_by,sr.create_time,sr.update_by,
-        sr.update_time,sr.is_delete,si.is_enable as isEnable,si.id as userInfoId
+        sr.update_time,sr.is_delete,si.is_enable as isEnable
         FROM sys_user sr
         LEFT JOIN sys_user_plate_info si on sr.id = si.user_id
         <where>