785834757 1 год назад
Родитель
Сommit
2ddb458645

+ 0 - 3
commons/src/main/java/com/jzg/commons/entity/vo/IsDeleteVo.java

@@ -15,7 +15,4 @@ import java.util.List;
 public class IsDeleteVo {
     @Schema(description = "id集合")
     private List<String> ids;
-
-    @Schema(description = "获取全部")
-    private Integer getAll;
 }

+ 1 - 1
commons/src/main/java/com/jzg/commons/exception/GlobalExceptionHandler.java

@@ -29,7 +29,7 @@ public class GlobalExceptionHandler {
     @ExceptionHandler(value = SystemException.class)
     @ResponseBody
     public HttpResult systemExceptionHandle(SystemException systemException) {
-        return HttpResult.error(Integer.parseInt(systemException.getCode()), systemException.getMessage());
+            return HttpResult.error(Integer.parseInt(systemException.getCode()), systemException.getMessage());
     }
 
     @ExceptionHandler(value = ValidateException.class)

+ 7 - 0
tenant/organization/src/main/java/com/jzg/organization/mapper/SysUserRoleMapper.java

@@ -15,4 +15,11 @@ import java.util.List;
 public interface SysUserRoleMapper extends BaseMapper<SysUserRole> {
 
     List<SysRole> getUserRole(String userId);
+
+    /**
+     * 物理删除用户角色信息
+     * @param userId
+     * @return
+     */
+    boolean deleteByUserId(String userId);
 }

+ 7 - 0
tenant/organization/src/main/java/com/jzg/organization/service/SysUserRoleService.java

@@ -21,4 +21,11 @@ public interface SysUserRoleService extends IService<SysUserRole> {
      */
     List<SysRole> getUserRole(String userId);
 
+    /**
+     * 删除用户角色信息
+     * @param userId
+     * @return
+     */
+    boolean deleteByUserId(String userId);
+
 }

+ 5 - 0
tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserRoleServiceImpl.java

@@ -34,4 +34,9 @@ public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleMapper, SysUs
     public List<SysRole> getUserRole(String userId) {
         return baseMapper.getUserRole(userId);
     }
+
+    @Override
+    public boolean deleteByUserId(String userId) {
+        return baseMapper.deleteByUserId(userId);
+    }
 }

+ 90 - 137
tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserServiceImpl.java

@@ -253,17 +253,17 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         SysUser sysUser = baseMapper.getUserByMobile(sysUserVo.getMobile());
         String sysUserJzgInfoId = "",sysUserId = "";
         if (!Objects.isNull(sysUser)) {
-//            verifyUser(sysUserVo.getTypeAttr(),sysUserVo.getDeptId(),sysUserVo.getIdentity(),sysUser.getId(),sysUserVo.getLeaderId(),sysUserVo.getReferrerId());
-//            SysUserJzgInfo sysUserJzgInfo = new SysUserJzgInfo();
-//            BeanUtils.copyProperties(sysUserVo, sysUserJzgInfo);
-//            sysUserJzgInfo.setUserId(sysUser.getId());
-//            sysUserJzgInfoService.save(sysUserJzgInfo);
-//            sysUserJzgInfoId = sysUserJzgInfo.getId();
-//            sysUserId = sysUser.getId();
-//            saveOrganization(sysUserVo.getOrganizationId(), sysUserJzgInfo.getId());
-//            saveFile(sysUserVo.getSfz1(), sysUserVo.getSfz2(), sysUserVo.getQualification(), sysUserVo.getContract(), sysUserVo.getApplicant(), sysUserVo.getSalaryTable(), sysUserVo.getLeaveTable(),sysUserJzgInfo.getId());
+            verifyUser(sysUserVo.getTypeAttr(),sysUserVo.getDeptId(),sysUserVo.getIdentity(),sysUser.getId(),sysUserVo.getLeaderId(),sysUserVo.getReferrerId());
+            SysUserJzgInfo sysUserJzgInfo = new SysUserJzgInfo();
+            BeanUtils.copyProperties(sysUserVo, sysUserJzgInfo);
+            sysUserJzgInfo.setUserId(sysUser.getId());
+            sysUserJzgInfoService.save(sysUserJzgInfo);
+            sysUserJzgInfoId = sysUserJzgInfo.getId();
+            sysUserId = sysUser.getId();
+            saveOrganization(sysUserVo.getOrganizationId(), sysUserJzgInfo.getId());
+            saveFile(sysUserVo.getSfz1(), sysUserVo.getSfz2(), sysUserVo.getQualification(), sysUserVo.getContract(), sysUserVo.getApplicant(), sysUserVo.getSalaryTable(), sysUserVo.getLeaveTable(),sysUserJzgInfo.getId());
             //系统中已存在业务员
-            throw new SystemException("用户信息已存在,无法添加");
+//            throw new SystemException("用户信息已存在,无法添加");
         } else {
             // 如果手机号为新号 重新生成SysUser 设置默认密码
             SysUser sysUser1 = new SysUser(sysUserVo.getMobile(),sysUserVo.getMobile());
@@ -304,20 +304,17 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         return HttpResult.ok(resultMsg);
     }
 
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public HttpResult<Boolean> deleteUserInfo(IsDeleteVo isDeleteVo) {
-        if (isDeleteVo.getGetAll() == 1) {
-            List<SysUserJzgInfo> sysUserJzgInfoList = sysUserJzgInfoService.list();
-            sysUserJzgInfoService.removeBatchByIds(sysUserJzgInfoList);
-        } else {
-            for (String id : isDeleteVo.getIds()) {
-                SysUserJzgInfo sysUserJzgInfo = sysUserJzgInfoService.getById(id);
-                if (sysUserJzgInfo == null) {
-                    throw new SystemException("该用户不存在");
-                }
-                sysUserJzgInfoService.removeById(id);
+        for (String id : isDeleteVo.getIds()) {
+            SysUserJzgInfo sysUserJzgInfo = sysUserJzgInfoService.getById(id);
+            sysDeptService.checkChangeDept(sysUserJzgInfo.getUserId());
+            if (sysUserJzgInfo == null) {
+                throw new SystemException("该用户不存在");
             }
+            sysUserJzgInfoService.removeById(id);
         }
         return HttpResult.ok("删除业务员成功");
     }
@@ -417,26 +414,26 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         List<SysRole> userRole = sysUserRoleService.getUserRole(sysUserVo.getId());
         List<String> roleIds = userRole.stream().map(u -> u.getId()).collect(Collectors.toList());
         if(!roleIds.isEmpty()) {
-            sysUserRoleService.remove(new LambdaQueryWrapper<SysUserRole>()
-                    .eq(SysUserRole::getUserId, sysUserVo.getId())
-                    .in(SysUserRole::getRoleId, roleIds));
+            sysUserRoleService.deleteByUserId(sysUserVo.getUserId());
         }
         List<SysUserRole> sysUserRoleList = new ArrayList<>();
         sysUserVo.getRoleIds().forEach(roleId->{
-            SysUserRole sysUserRole = new SysUserRole(sysUserVo.getId(),roleId);
+            SysUserRole sysUserRole = new SysUserRole(sysUserVo.getUserId(),roleId);
             sysUserRoleList.add(sysUserRole);
         });
         sysUserRoleService.saveBatch(sysUserRoleList);
 
         //修改团队信息
-        sysOrganizationUserLinkService.remove(new LambdaQueryWrapper<SysOrganizationUserLink>()
-               .eq(SysOrganizationUserLink::getUserId, sysUserVo.getId())
-                .eq(SysOrganizationUserLink::getOrganizationId,sysUserVo.getOrganizationId()));
-        SysOrganizationUserLink sysOrganizationUserLink = new SysOrganizationUserLink();
-        sysOrganizationUserLink.setId(IdGenerate.nextId());
-        sysOrganizationUserLink.setUserId(sysUserVo.getUserId());
-        sysOrganizationUserLink.setOrganizationId(sysUserVo.getOrganizationId());
-        sysOrganizationUserLinkService.save(sysOrganizationUserLink);
+        if(sysUserVo.getOrganizationId() != null && !sysUserVo.getOrganizationId().isEmpty()) {
+            sysOrganizationUserLinkService.remove(new LambdaQueryWrapper<SysOrganizationUserLink>()
+                    .eq(SysOrganizationUserLink::getUserId, sysUserVo.getId())
+                    .eq(SysOrganizationUserLink::getOrganizationId, sysUserVo.getOrganizationId()));
+            SysOrganizationUserLink sysOrganizationUserLink = new SysOrganizationUserLink();
+            sysOrganizationUserLink.setId(IdGenerate.nextId());
+            sysOrganizationUserLink.setUserId(sysUserVo.getUserId());
+            sysOrganizationUserLink.setOrganizationId(sysUserVo.getOrganizationId());
+            sysOrganizationUserLinkService.save(sysOrganizationUserLink);
+        }
 
         return HttpResult.ok("修改业务员成功");
     }
@@ -448,6 +445,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             throw new SystemException("该用户不存在");
         }
         SysUser sysUser = sysUserService.getById(sysUserJzgInfo.getUserId());
+        if(sysUser == null){
+            throw new SystemException("该用户不存在");
+        }
         sysUserJzgInfo.setMobile(sysUser.getMobile());
         SysDept dept = sysDeptService.getById(sysUserJzgInfo.getDeptId());
         if(!Objects.isNull(dept)){
@@ -606,118 +606,71 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         }
     }
 
-    public void verifyFile(String sfz1,String sfz2,String qualification,String contract,String applicant,String salaryTable,String leaveTable,String userId){
-        if (sfz1 != null) {
-            SysUserJzgInfoFile sysUserJzgInfoFileVerify = sysUserJzgInfoFileService.getOne(
-                    (new LambdaQueryWrapper<SysUserJzgInfoFile>().eq(SysUserJzgInfoFile::getId, sfz1)));
-            if (sysUserJzgInfoFileVerify == null) {
-                List<SysUserJzgInfoFile> sysUserJzgInfoFiles = sysUserJzgInfoFileService.list(
-                        (new LambdaQueryWrapper<SysUserJzgInfoFile>().eq(SysUserJzgInfoFile::getUserJzgInfoId, userId)
-                                .eq(SysUserJzgInfoFile::getFileType, "sfz1")));
-                sysUserJzgInfoFileService.removeBatchByIds(sysUserJzgInfoFiles);
-                SysUploadFiles sysUploadFiles = sysUploadFilesMapper.selectOne
-                        (new LambdaQueryWrapper<SysUploadFiles>().eq(SysUploadFiles::getId, sfz1));
-                SysUserJzgInfoFile sysUserJzgInfoFile = new SysUserJzgInfoFile(sfz1, userId, sysUploadFiles.getFileName());
-                sysUserJzgInfoFile.setFileType("sfz1");
-                sysUserJzgInfoFile.setFileUrl(MinioUtils.getPresignedObjectUrl("jzg", sysUploadFiles.getFileName()));
-                sysUserJzgInfoFileService.save(sysUserJzgInfoFile);
+    public boolean uploadFile(String fileId,String fileType,String userId){
+        List<SysUserJzgInfoFile> sysUserJzgInfoFiles = sysUserJzgInfoFileService.list(
+                (new LambdaQueryWrapper<SysUserJzgInfoFile>().eq(SysUserJzgInfoFile::getUserJzgInfoId, userId)
+                        .eq(SysUserJzgInfoFile::getFileType, fileType)));
+        if(sysUserJzgInfoFiles.size()>0) {
+            sysUserJzgInfoFileService.removeBatchByIds(sysUserJzgInfoFiles);
+        }
+        SysUploadFiles sysUploadFiles = sysUploadFilesMapper.selectOne
+                (new LambdaQueryWrapper<SysUploadFiles>().eq(SysUploadFiles::getId, fileId));
+        SysUserJzgInfoFile sysUserJzgInfoFile = new SysUserJzgInfoFile(fileId, userId, sysUploadFiles.getFileName());
+        sysUserJzgInfoFile.setFileType("sfz1");
+        sysUserJzgInfoFile.setFileUrl(MinioUtils.getPresignedObjectUrl("jzg", sysUploadFiles.getFileName()));
+        return sysUserJzgInfoFileService.save(sysUserJzgInfoFile);
+    }
+
+    /**
+     * 检测文件是否修改
+     * @return
+     */
+    public boolean checkFileModify(List<SysUserJzgInfoFile> fileList,String fileType,String fileId){
+        if(fileId!=null && !fileId.isEmpty()) {
+            List<SysUserJzgInfoFile> collect = fileList.stream().filter(x -> x.getFileId().equals(fileId) && x.getFileType().equals(fileType)).collect(Collectors.toList());
+            if (collect.size() > 0) {
+                return false;
             }
-        }
-        if (sfz2 != null) {
-            SysUserJzgInfoFile sysUserJzgInfoFileVerify = sysUserJzgInfoFileService.getOne(
-                    (new LambdaQueryWrapper<SysUserJzgInfoFile>().eq(SysUserJzgInfoFile::getId, sfz2)));
-            if (sysUserJzgInfoFileVerify == null) {
-                List<SysUserJzgInfoFile> sysUserJzgInfoFiles = sysUserJzgInfoFileService.list(
-                        (new LambdaQueryWrapper<SysUserJzgInfoFile>().eq(SysUserJzgInfoFile::getUserJzgInfoId, userId)
-                                .eq(SysUserJzgInfoFile::getFileType, "sfz2")));
-                sysUserJzgInfoFileService.removeBatchByIds(sysUserJzgInfoFiles);
-                SysUploadFiles sysUploadFiles = sysUploadFilesMapper.selectOne
-                        (new LambdaQueryWrapper<SysUploadFiles>().eq(SysUploadFiles::getId, sfz2));
-                SysUserJzgInfoFile sysUserJzgInfoFile = new SysUserJzgInfoFile(sfz2, userId, sysUploadFiles.getFileName());
-                sysUserJzgInfoFile.setFileType("sfz2");
-                sysUserJzgInfoFile.setFileUrl(MinioUtils.getPresignedObjectUrl("jzg", sysUploadFiles.getFileName()));
-                sysUserJzgInfoFileService.save(sysUserJzgInfoFile);
+        }else{
+            //如果传入的文件id为空  , 判断是否存在文件 如果存在则删除
+            List<SysUserJzgInfoFile> collect = fileList.stream().filter(x -> x.getFileType().equals(fileType)).collect(Collectors.toList());
+            if (collect.size() > 0) {
+                sysUserJzgInfoFileService.removeBatchByIds(collect);
             }
+            return false;
         }
-        if (qualification != null) {
-            SysUserJzgInfoFile sysUserJzgInfoFileVerify = sysUserJzgInfoFileService.getOne(
-                    (new LambdaQueryWrapper<SysUserJzgInfoFile>().eq(SysUserJzgInfoFile::getId, qualification)));
-            if (sysUserJzgInfoFileVerify == null) {
-                List<SysUserJzgInfoFile> sysUserJzgInfoFiles = sysUserJzgInfoFileService.list(
-                        (new LambdaQueryWrapper<SysUserJzgInfoFile>().eq(SysUserJzgInfoFile::getUserJzgInfoId, userId)
-                                .eq(SysUserJzgInfoFile::getFileType, "qualification")));
-                sysUserJzgInfoFileService.removeBatchByIds(sysUserJzgInfoFiles);
-                SysUploadFiles sysUploadFiles = sysUploadFilesMapper.selectOne
-                        (new LambdaQueryWrapper<SysUploadFiles>().eq(SysUploadFiles::getId, qualification));
-                SysUserJzgInfoFile sysUserJzgInfoFile = new SysUserJzgInfoFile(qualification, userId, sysUploadFiles.getFileName());
-                sysUserJzgInfoFile.setFileType("qualification");
-                sysUserJzgInfoFile.setFileUrl(MinioUtils.getPresignedObjectUrl("jzg", sysUploadFiles.getFileName()));
-                sysUserJzgInfoFileService.save(sysUserJzgInfoFile);
-            }
+
+        return true;
+    }
+
+    public void verifyFile(String sfz1,String sfz2,String qualification,String contract,String applicant,String salaryTable,String leaveTable,String userId){
+        List<SysUserJzgInfoFile> fileList = sysUserJzgInfoFileService.list(new LambdaQueryWrapper<SysUserJzgInfoFile>()
+                .eq(SysUserJzgInfoFile::getUserJzgInfoId, userId));
+        if(checkFileModify(fileList,"sfz1",sfz1)){
+            uploadFile(sfz1,"sfz1",userId);
         }
-        if (contract != null) {
-            SysUserJzgInfoFile sysUserJzgInfoFileVerify = sysUserJzgInfoFileService.getOne(
-                    (new LambdaQueryWrapper<SysUserJzgInfoFile>().eq(SysUserJzgInfoFile::getId, contract)));
-            if (sysUserJzgInfoFileVerify == null) {
-                List<SysUserJzgInfoFile> sysUserJzgInfoFiles = sysUserJzgInfoFileService.list(
-                        (new LambdaQueryWrapper<SysUserJzgInfoFile>().eq(SysUserJzgInfoFile::getUserJzgInfoId, userId)
-                                .eq(SysUserJzgInfoFile::getFileType, "contract")));
-                sysUserJzgInfoFileService.removeBatchByIds(sysUserJzgInfoFiles);
-                SysUploadFiles sysUploadFiles = sysUploadFilesMapper.selectOne
-                        (new LambdaQueryWrapper<SysUploadFiles>().eq(SysUploadFiles::getId, contract));
-                SysUserJzgInfoFile sysUserJzgInfoFile = new SysUserJzgInfoFile(contract, userId, sysUploadFiles.getFileName());
-                sysUserJzgInfoFile.setFileType("contract");
-                sysUserJzgInfoFile.setFileUrl(MinioUtils.getPresignedObjectUrl("jzg", sysUploadFiles.getFileName()));
-                sysUserJzgInfoFileService.save(sysUserJzgInfoFile);
-            }
+        if(checkFileModify(fileList,"sfz2",sfz2)){
+            uploadFile(sfz2,"sfz2",userId);
         }
-        if (applicant != null) {
-            SysUserJzgInfoFile sysUserJzgInfoFileVerify = sysUserJzgInfoFileService.getOne(
-                    (new LambdaQueryWrapper<SysUserJzgInfoFile>().eq(SysUserJzgInfoFile::getId, applicant)));
-            if (sysUserJzgInfoFileVerify == null) {
-                List<SysUserJzgInfoFile> sysUserJzgInfoFiles = sysUserJzgInfoFileService.list(
-                        (new LambdaQueryWrapper<SysUserJzgInfoFile>().eq(SysUserJzgInfoFile::getUserJzgInfoId, userId)
-                                .eq(SysUserJzgInfoFile::getFileType, "applicant")));
-                sysUserJzgInfoFileService.removeBatchByIds(sysUserJzgInfoFiles);
-                SysUploadFiles sysUploadFiles = sysUploadFilesMapper.selectOne
-                        (new LambdaQueryWrapper<SysUploadFiles>().eq(SysUploadFiles::getId, applicant));
-                SysUserJzgInfoFile sysUserJzgInfoFile = new SysUserJzgInfoFile(applicant, userId, sysUploadFiles.getFileName());
-                sysUserJzgInfoFile.setFileType("applicant");
-                sysUserJzgInfoFile.setFileUrl(MinioUtils.getPresignedObjectUrl("jzg", sysUploadFiles.getFileName()));
-                sysUserJzgInfoFileService.save(sysUserJzgInfoFile);
-            }
+
+        if(checkFileModify(fileList,"qualification",qualification)){
+            uploadFile(qualification,"qualification",userId);
         }
-        if (salaryTable != null) {
-            SysUserJzgInfoFile sysUserJzgInfoFileVerify = sysUserJzgInfoFileService.getOne(
-                    (new LambdaQueryWrapper<SysUserJzgInfoFile>().eq(SysUserJzgInfoFile::getId, salaryTable)));
-            if (sysUserJzgInfoFileVerify == null) {
-                List<SysUserJzgInfoFile> sysUserJzgInfoFiles = sysUserJzgInfoFileService.list(
-                        (new LambdaQueryWrapper<SysUserJzgInfoFile>().eq(SysUserJzgInfoFile::getUserJzgInfoId, userId)
-                                .eq(SysUserJzgInfoFile::getFileType, "salaryTable")));
-                sysUserJzgInfoFileService.removeBatchByIds(sysUserJzgInfoFiles);
-                SysUploadFiles sysUploadFiles = sysUploadFilesMapper.selectOne
-                        (new LambdaQueryWrapper<SysUploadFiles>().eq(SysUploadFiles::getId, salaryTable));
-                SysUserJzgInfoFile sysUserJzgInfoFile = new SysUserJzgInfoFile(salaryTable,userId,sysUploadFiles.getFileName());
-                sysUserJzgInfoFile.setFileType("salary");
-                sysUserJzgInfoFile.setFileUrl(MinioUtils.getPresignedObjectUrl("jzg", sysUploadFiles.getFileName()));
-                sysUserJzgInfoFileService.save(sysUserJzgInfoFile);
-            }
+
+        if(checkFileModify(fileList,"contract",contract)){
+            uploadFile(contract,"contract",userId);
         }
-        if (leaveTable != null) {
-            SysUserJzgInfoFile sysUserJzgInfoFileVerify = sysUserJzgInfoFileService.getOne(
-                    (new LambdaQueryWrapper<SysUserJzgInfoFile>().eq(SysUserJzgInfoFile::getId, leaveTable)));
-            if (sysUserJzgInfoFileVerify == null) {
-                List<SysUserJzgInfoFile> sysUserJzgInfoFiles = sysUserJzgInfoFileService.list(
-                        (new LambdaQueryWrapper<SysUserJzgInfoFile>().eq(SysUserJzgInfoFile::getUserJzgInfoId, userId)
-                                .eq(SysUserJzgInfoFile::getFileType, "leaveTable")));
-                sysUserJzgInfoFileService.removeBatchByIds(sysUserJzgInfoFiles);
-                SysUploadFiles sysUploadFiles = sysUploadFilesMapper.selectOne
-                        (new LambdaQueryWrapper<SysUploadFiles>().eq(SysUploadFiles::getId, leaveTable));
-                SysUserJzgInfoFile sysUserJzgInfoFile = new SysUserJzgInfoFile(leaveTable, userId, sysUploadFiles.getFileName());
-                sysUserJzgInfoFile.setFileType("leave");
-                sysUserJzgInfoFile.setFileUrl(MinioUtils.getPresignedObjectUrl("jzg", sysUploadFiles.getFileName()));
-                sysUserJzgInfoFileService.save(sysUserJzgInfoFile);
-            }
+
+        if(checkFileModify(fileList,"applicant",applicant)){
+            uploadFile(applicant,"applicant",userId);
+        }
+
+        if(checkFileModify(fileList,"salaryTable",salaryTable)){
+            uploadFile(salaryTable,"salaryTable",userId);
+        }
+
+        if(checkFileModify(fileList,"leaveTable",leaveTable)){
+            uploadFile(leaveTable,"leaveTable",userId);
         }
     }
 }

+ 3 - 0
tenant/organization/src/main/resources/mapper/SysOrganizationMapper.xml

@@ -26,6 +26,9 @@
             <if test="params.param != null and params.param != ''">
                 and sys_organization.name like concat('%',#{params.param},'%')
             </if>
+            <if test="params.attribute!= null and params.attribute!= ''">
+                and sys_organization.attribute = #{params.attribute}
+            </if>
         and is_delete = 0
         </where>
     </select>

+ 2 - 2
tenant/organization/src/main/resources/mapper/SysUserJzgInfoMapper.xml

@@ -79,8 +79,8 @@
         <if test="sysUserInfoListVo.typeAttr != null and sysUserInfoListVo.typeAttr != ''">
             and suji.type_attr = #{sysUserInfoListVo.typeAttr}
         </if>
-        <if test="sysUserInfoListVo.status != null and sysUserInfoListVo.status != ''">
-            and suji.status = #{sysUserInfoListVo.status}
+        <if test="sysUserInfoListVo.status != null and sysUserInfoListVo.status != '-1'">
+            and suji.status = #{sysUserInfoListVo.status} n
         </if>
         <if test="sysUserInfoListVo.isEnable != null and sysUserInfoListVo.isEnable != ''">
             and suji.is_enable = #{sysUserInfoListVo.isEnable}

+ 4 - 0
tenant/organization/src/main/resources/mapper/SysUserRoleMapper.xml

@@ -10,4 +10,8 @@
                 INNER JOIN sys_role sr ON sur.role_id = sr.id
         WHERE user_id = #{userId}
     </select>
+
+    <delete id="deleteByUserId">
+        DELETE FROM sys_user_role WHERE user_id = #{userId}
+    </delete>
 </mapper>