Merge remote-tracking branch 'origin/master'

commons/src/main/java/com/jzg/commons/constants/Constants.java

@@ -75,4 +75,16 @@ public class Constants
      */
     public static final String DEFAULT_PASSWORD = "12345678";
 
+
+    /**
+     * 是否删除   0-未删除   1-已删除
+     */
+    public static final String NOT_DELETED = "0";
+
+    /**
+     * 是否删除  0-未删除   1-已删除
+     */
+    public static final String DELETE = "1";
+
+
 }

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

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.jzg.commons.core.base.BaseModel;
 import com.jzg.commons.entity.dto.SysUserJzgInfoBankCardDto;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -314,10 +316,10 @@ public class SysUserJzgInfo extends BaseModel implements Serializable {
     @Schema(description = "银行卡名称")
     private String bankName;
 
-    public SysUserJzgInfo(SysUser user, String systemCode, String deptId){
+    public SysUserJzgInfo(String userName, SysUser user, String systemCode, String deptId){
         this.userId = user.getId();
         //默认添加管理员账户
-        this.name = "管理员";
+        this.name = userName;
         this.status = 0;
         this.isEnable = 0;
         this.deptId = deptId;

commons/src/main/java/com/jzg/commons/entity/vo/SysUserInfoListVo.java

@@ -46,4 +46,7 @@ public class SysUserInfoListVo extends PageRequest {
     @Schema(description = "团队ID")
     private String sysOrganizationId;
 
+    @Schema(description = "1.成员 、 2.业务员")
+    private String isMember;
+
 }

commons/src/main/java/com/jzg/commons/entity/vo/SysUserVo.java

@@ -169,6 +169,9 @@ public class SysUserVo extends PageRequest {
     @Schema(description = "离职表")
     private String leaveTable;
 
+    @Schema(description = "银行卡")
+    private String bankCard;
+
     @Schema(description = "团队、渠道、电销id")
     private String organizationId;
 

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

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jzg.commons.constants.Constants;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.dto.QrBarcodeConfigParam;
 import com.jzg.commons.entity.po.QrBarcodeConfig;
@@ -13,7 +14,6 @@ import com.jzg.mapper.QrBarcodeMapper;
 import com.jzg.service.QrBarcodeService;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
 
 
 @Service
@@ -24,6 +24,7 @@ public class QrBarcodeServiceImpl extends ServiceImpl<QrBarcodeMapper, QrBarcode
         LambdaQueryWrapper<QrBarcodeConfig> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.like(StringUtils.isNotEmpty(barcodeConfigParam.getCompanyName()),QrBarcodeConfig::getCompanyName, barcodeConfigParam.getCompanyName());
         queryWrapper.orderByDesc(QrBarcodeConfig::getCreateTime);
+        queryWrapper.eq(QrBarcodeConfig::getIsDelete, Constants.NOT_DELETED);
         Page page = baseMapper.selectPage(barcodeConfigParam.getPage(), queryWrapper);
         page.setRecords(BeanUtil.copyToList(page.getRecords(), QrBarcodeConfigVo.class));
         return HttpResult.ok(page);

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

@@ -211,11 +211,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
             sysDepts = map.get("0");
         }
         List<SysDeptVo> newResultDept = new ArrayList<>();
-        SysDeptVo baseDept = new SysDeptVo(sysDept);
-        baseDept.setId("0");
-        baseDept.setName(bySysCode.getSysName());
-        baseDept.setChildren(sysDepts);
-        newResultDept.add(baseDept);
+        newResultDept.addAll(sysDepts);
         return newResultDept;
     }
 

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

@@ -278,7 +278,10 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
         }
         SysUser user = sysUserMapper.selectById(system.getUserId());
         SysUserJzgInfo info = sysUserJzgInfoMapper.selectOne(new LambdaQueryWrapper<SysUserJzgInfo>()
-                .eq(SysUserJzgInfo::getUserId, user.getId()));
+                .eq(SysUserJzgInfo::getUserId, user.getId())
+                .eq(SysUserJzgInfo::getIsDelete, YesNoEnum.NO.getCode())
+                .eq(SysUserJzgInfo::getSystemCode, system.getSysCode())
+        );
         vo.setUserName(info.getName());
         vo.setUserAccount(user.getMobile());
         return vo;
@@ -316,7 +319,7 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
         SysDept sysDept = new SysDept(sysSystem);
         sysDeptMapper.insert(sysDept);
         // 新增用户机构关联信息
-        SysUserJzgInfo info = new SysUserJzgInfo(user, sysSystem.getSysCode(),sysDept.getId());
+        SysUserJzgInfo info = new SysUserJzgInfo(param.getUserName(),user, sysSystem.getSysCode(),sysDept.getId());
         sysUserJzgInfoMapper.insert(info);
         // 查询该租户是否有管理员角色
         LambdaQueryWrapper<SysRole> queryWrapper = new LambdaQueryWrapper<>();
@@ -405,20 +408,16 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
             // 新增管理员用户
             sysUser = new SysUser(param);
             boolean mobileExists = this.isExistsMobile(sysUser.getMobile());
-            if(mobileExists){
-                throw new SystemException("管理员手机号重复！");
-            }
+            if(mobileExists){throw new SystemException("管理员手机号重复！");}
             boolean nameExists = this.isExistsUserName(sysUser.getUsername());
-            if(nameExists){
-                throw new SystemException("管理员用户名重复！");
-            }
+            if(nameExists){throw new SystemException("管理员用户名重复！");}
             sysUserMapper.insert(sysUser);
 
             // 新建顶级机构
             SysDept sysDept = new SysDept(sysSystem);
             sysDeptMapper.insert(sysDept);
             // 新增用户机构关联信息
-            SysUserJzgInfo info = new SysUserJzgInfo(sysUser,sysSystem.getSysCode(), sysDept.getId());
+            SysUserJzgInfo info = new SysUserJzgInfo(param.getUserName(), sysUser,sysSystem.getSysCode(), sysDept.getId());
             sysUserJzgInfoMapper.insert(info);
         }
     }

tenant/organization/src/main/java/com/jzg/organization/mapper/SysUserRoleMapper.java

@@ -21,5 +21,5 @@ public interface SysUserRoleMapper extends BaseMapper<SysUserRole> {
      * @param userId
      * @return
      */
-    boolean deleteByUserId(String userId);
+    boolean deleteByUserId(@Param("userId") String userId,@Param("roleIds") List<String> roleIds);
 }

tenant/organization/src/main/java/com/jzg/organization/service/SysUserRoleService.java

@@ -26,6 +26,6 @@ public interface SysUserRoleService extends IService<SysUserRole> {
      * @param userId
      * @return
      */
-    boolean deleteByUserId(String userId);
+    boolean deleteByUserId(String userId,List<String> roleIds);
 
 }

tenant/organization/src/main/java/com/jzg/organization/service/impl/PosterServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.util.ObjectUtil;
 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.jzg.commons.constants.Constants;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.dto.PosterParam;
 import com.jzg.commons.entity.po.SysPoster;
@@ -25,7 +26,7 @@ public class PosterServiceImpl extends ServiceImpl<PosterMapper, SysPoster> impl
         QueryWrapper<SysPoster> queryWrapper = new QueryWrapper<>();
         queryWrapper.like(StringUtils.isNotEmpty(posterParam.getTitle()), "p.title", posterParam.getTitle());
         queryWrapper.like(StringUtils.isNotEmpty(posterParam.getOrgName()), "orgName", posterParam.getOrgName());
-        queryWrapper.eq("p.is_delete", 0);
+        queryWrapper.eq("p.is_delete", Constants.NOT_DELETED);
         queryWrapper.orderByDesc("p.create_time");
         Page<SysPosterVo> page = baseMapper.queryPage(posterParam.getPage(), queryWrapper);
         page.getRecords().forEach(sysPosterVo -> {

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysDeptServiceImpl.java

@@ -200,11 +200,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
             sysDepts = map.get("0");
         }
         List<SysDeptVo> newResultDept = new ArrayList<>();
-        SysDeptVo baseDept = new SysDeptVo(sysDept);
-        baseDept.setId("0");
-        baseDept.setName(bySysCode.getSysName());
-        baseDept.setChildren(sysDepts);
-        newResultDept.add(baseDept);
+        newResultDept.addAll(sysDepts);
         return newResultDept;
     }
 

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysOrganizationServiceImpl.java

@@ -60,9 +60,7 @@ public class SysOrganizationServiceImpl extends ServiceImpl<SysOrganizationMappe
         if (ObjectUtil.isEmpty(sysOrganizationParam)){
             return lambdaQueryWrapper;
         }
-        if (StringUtils.isNotEmpty(sysOrganizationParam.getParam())){
-            lambdaQueryWrapper.like(SysOrganization::getName, sysOrganizationParam.getParam());
-        }
+        lambdaQueryWrapper.like(StringUtils.isNotEmpty(sysOrganizationParam.getParam()),SysOrganization::getName, sysOrganizationParam.getParam());
         lambdaQueryWrapper.orderByDesc(SysOrganization::getCreateTime);
         return lambdaQueryWrapper;
     }
@@ -88,9 +86,7 @@ public class SysOrganizationServiceImpl extends ServiceImpl<SysOrganizationMappe
 
     @Override
     public HttpResult addTeamUsers(SysOrganizationUserLinkAdd organizationUserLinkAdd) {
-
-        SysOrganizationUserLink userLink = sysOrganizationUserLinkService.selectByOrgIdAndUserId(organizationUserLinkAdd);
-        if (ObjectUtil.isNotEmpty(userLink)){
+        if (ObjectUtil.isNotEmpty(sysOrganizationUserLinkService.selectByOrgIdAndUserId(organizationUserLinkAdd))){
             return HttpResult.error("该团队、渠道、电销组已关联该用户，请勿重复关联");
         }
         SysOrganizationUserLink organizationUserLink = new SysOrganizationUserLink();
@@ -124,10 +120,10 @@ public class SysOrganizationServiceImpl extends ServiceImpl<SysOrganizationMappe
         if (null != idCount && idCount > 0){
             return HttpResult.error("该机构下还有用户，请先删除用户");
         }
-        LambdaUpdateWrapper<SysOrganization> updateWrapper = new LambdaUpdateWrapper<SysOrganization>()
-                .eq(SysOrganization::getId, id)
-                .set(SysOrganization::getIsDelete, 1);
-        return sysOrganizationMapper.update(updateWrapper) > 0 ? HttpResult.ok("删除成功") : HttpResult.error("删除失败");
+        return sysOrganizationMapper.update(new LambdaUpdateWrapper<SysOrganization>().
+                eq(SysOrganization::getId, id).
+                set(SysOrganization::getIsDelete, 1)) > 0 ?
+                HttpResult.ok("删除成功") : HttpResult.error("删除失败");
     }
 
     @Override

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysOrganizationUserLinkServiceImpl.java

@@ -25,25 +25,21 @@ public class SysOrganizationUserLinkServiceImpl extends ServiceImpl<SysOrganizat
 
     @Override
     public Long selectByOrgIdCount(String id) {
-        LambdaQueryWrapper<SysOrganizationUserLink> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.eq(SysOrganizationUserLink::getOrganizationId, id);
-        return sysOrganizationUserLinkServiceMapper.selectCount(lambdaQueryWrapper);
+        return sysOrganizationUserLinkServiceMapper.selectCount(new LambdaQueryWrapper<SysOrganizationUserLink>().eq(SysOrganizationUserLink::getOrganizationId, id));
     }
 
     @Override
     public HttpResult deleteAssociatedUsers(DeleteAssociatedUsers deleteAssociatedUsers) {
-        QueryWrapper<SysOrganizationUserLink> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("organization_id",deleteAssociatedUsers.getId());
-        queryWrapper.in("user_id",deleteAssociatedUsers.getUserIds());
-        return sysOrganizationUserLinkServiceMapper.delete(queryWrapper) > 0 ? HttpResult.ok("删除成功") : HttpResult.error("删除失败");
+        return sysOrganizationUserLinkServiceMapper.delete(new LambdaQueryWrapper<SysOrganizationUserLink>().
+                eq(SysOrganizationUserLink::getOrganizationId,deleteAssociatedUsers.getId()).
+                in(SysOrganizationUserLink::getUserId,deleteAssociatedUsers.getUserIds())) > 0 ? HttpResult.ok("删除成功") : HttpResult.error("删除失败");
     }
 
     @Override
     public SysOrganizationUserLink selectByOrgIdAndUserId(SysOrganizationUserLinkAdd organizationUserLinkAdd) {
-        LambdaQueryWrapper<SysOrganizationUserLink> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.eq(SysOrganizationUserLink::getOrganizationId, organizationUserLinkAdd.getOrganizationId())
-                .eq(SysOrganizationUserLink::getUserId, organizationUserLinkAdd.getUserId());
-        return sysOrganizationUserLinkServiceMapper.selectOne(lambdaQueryWrapper);
+        return sysOrganizationUserLinkServiceMapper.selectOne(new LambdaQueryWrapper<SysOrganizationUserLink>().
+                eq(SysOrganizationUserLink::getOrganizationId, organizationUserLinkAdd.getOrganizationId()).
+                eq(SysOrganizationUserLink::getUserId, organizationUserLinkAdd.getUserId()));
     }
 
 

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserRoleServiceImpl.java

@@ -36,7 +36,7 @@ public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleMapper, SysUs
     }
 
     @Override
-    public boolean deleteByUserId(String userId) {
-        return baseMapper.deleteByUserId(userId);
+    public boolean deleteByUserId(String userId,List<String> roleIds) {
+        return baseMapper.deleteByUserId(userId,roleIds);
     }
 }

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserServiceImpl.java

@@ -260,7 +260,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             sysUserJzgInfoService.save(sysUserJzgInfo);
             sysUserJzgInfoId = sysUserJzgInfo.getId();
             sysUserId = sysUser.getId();
-            saveOrganization(sysUserVo.getOrganizationId(), sysUserJzgInfo.getId());
+            saveOrganization(sysUserVo.getOrganizationId(), sysUserJzgInfo.getUserId());
             saveFile(sysUserVo.getSfz1(), sysUserVo.getSfz2(), sysUserVo.getQualification(), sysUserVo.getContract(), sysUserVo.getApplicant(), sysUserVo.getSalaryTable(), sysUserVo.getLeaveTable(),sysUserJzgInfo.getId());
             //系统中已存在业务员
 //            throw new SystemException("用户信息已存在,无法添加");
@@ -275,7 +275,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             sysUserJzgInfoId = sysUserJzgInfo.getId();
             sysUserId = sysUser1.getId();
             sysUserJzgInfoService.save(sysUserJzgInfo);
-            saveOrganization(sysUserVo.getOrganizationId(), sysUserJzgInfo.getId());
+            saveOrganization(sysUserVo.getOrganizationId(), sysUserJzgInfo.getUserId());
             saveFile(sysUserVo.getSfz1(), sysUserVo.getSfz2(), sysUserVo.getQualification(), sysUserVo.getContract(), sysUserVo.getApplicant(), sysUserVo.getSalaryTable(), sysUserVo.getLeaveTable(),sysUserJzgInfo.getId());
         }
 
@@ -316,7 +316,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             }
             sysUserJzgInfoService.removeById(id);
         }
-        return HttpResult.ok("删除业务员成功");
+        return HttpResult.ok("删除成功");
     }
 
     @Override
@@ -398,7 +398,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 //            throw new SystemException("该业务员已被禁用");
 //        }
         BeanUtils.copyProperties(sysUserVo, sysUserJzgInfo);
-        verifyFile(sysUserVo.getSfz1(), sysUserVo.getSfz2(), sysUserVo.getQualification(), sysUserVo.getContract(), sysUserVo.getApplicant(), sysUserVo.getSalaryTable(), sysUserVo.getLeaveTable(), sysUserJzgInfo.getId());
+        verifyFile(sysUserVo,sysUserJzgInfo.getId());
         if (sysUserJzgInfo.getStatus() == 5) { // 如果状态为5  说明该业务员重新提交审核  进行业务员审核
             StateResult stateResult = userStateListener.salesmanAuthIng(sysUserJzgInfo);
             if (stateResult.isResult()) {
@@ -411,10 +411,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         sysUserJzgInfoService.updateById(sysUserJzgInfo);
 
         //用户角色处理
-        List<SysRole> userRole = sysUserRoleService.getUserRole(sysUserVo.getId());
+        List<SysRole> userRole = sysUserRoleService.getUserRole(sysUserVo.getUserId());
         List<String> roleIds = userRole.stream().map(u -> u.getId()).collect(Collectors.toList());
         if(!roleIds.isEmpty()) {
-            sysUserRoleService.deleteByUserId(sysUserVo.getUserId());
+            sysUserRoleService.deleteByUserId(sysUserVo.getUserId(),roleIds);
         }
         List<SysUserRole> sysUserRoleList = new ArrayList<>();
         sysUserVo.getRoleIds().forEach(roleId->{
@@ -576,10 +576,13 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         }
         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);
+        if(sysUploadFiles != null) {
+            SysUserJzgInfoFile sysUserJzgInfoFile = new SysUserJzgInfoFile(fileId, userId, sysUploadFiles.getFileName());
+            sysUserJzgInfoFile.setFileType(fileType);
+            sysUserJzgInfoFile.setFileUrl(MinioUtils.getPresignedObjectUrl("jzg", sysUploadFiles.getFileName()));
+            return sysUserJzgInfoFileService.save(sysUserJzgInfoFile);
+        }
+        return false;
     }
 
     /**
@@ -588,7 +591,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      */
     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());
+            List<SysUserJzgInfoFile> collect = fileList.stream().filter(x -> x.getId().equals(fileId) && x.getFileType().equals(fileType)).collect(Collectors.toList());
             if (collect.size() > 0) {
                 return false;
             }
@@ -604,34 +607,38 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         return true;
     }
 
-    public void verifyFile(String sfz1,String sfz2,String qualification,String contract,String applicant,String salaryTable,String leaveTable,String userId){
+    public void verifyFile(SysUserVo sysUserVo,String userId){
         List<SysUserJzgInfoFile> fileList = sysUserJzgInfoFileService.list(new LambdaQueryWrapper<SysUserJzgInfoFile>()
                 .eq(SysUserJzgInfoFile::getUserJzgInfoId, userId));
-        if(checkFileModify(fileList,"sfz1",sfz1)){
-            uploadFile(sfz1,"sfz1",userId);
+        if(checkFileModify(fileList,"sfz1",sysUserVo.getSfz1())){
+            uploadFile(sysUserVo.getSfz1(),"sfz1",userId);
+        }
+        if(checkFileModify(fileList,"sfz2",sysUserVo.getSfz2())){
+            uploadFile(sysUserVo.getSfz2(),"sfz2",userId);
         }
-        if(checkFileModify(fileList,"sfz2",sfz2)){
-            uploadFile(sfz2,"sfz2",userId);
+
+        if(checkFileModify(fileList,"qualification",sysUserVo.getQualification())){
+            uploadFile(sysUserVo.getQualification(),"qualification",userId);
         }
 
-        if(checkFileModify(fileList,"qualification",qualification)){
-            uploadFile(qualification,"qualification",userId);
+        if(checkFileModify(fileList,"contract",sysUserVo.getContract())){
+            uploadFile(sysUserVo.getContract(),"contract",userId);
         }
 
-        if(checkFileModify(fileList,"contract",contract)){
-            uploadFile(contract,"contract",userId);
+        if(checkFileModify(fileList,"applicant",sysUserVo.getApplicant())){
+            uploadFile(sysUserVo.getApplicant(),"applicant",userId);
         }
 
-        if(checkFileModify(fileList,"applicant",applicant)){
-            uploadFile(applicant,"applicant",userId);
+        if(checkFileModify(fileList,"salaryTable",sysUserVo.getSalaryTable())){
+            uploadFile(sysUserVo.getSalaryTable(),"salaryTable",userId);
         }
 
-        if(checkFileModify(fileList,"salaryTable",salaryTable)){
-            uploadFile(salaryTable,"salaryTable",userId);
+        if(checkFileModify(fileList,"leaveTable",sysUserVo.getLeaveTable())){
+            uploadFile(sysUserVo.getLeaveTable(),"leaveTable",userId);
         }
 
-        if(checkFileModify(fileList,"leaveTable",leaveTable)){
-            uploadFile(leaveTable,"leaveTable",userId);
+        if(checkFileModify(fileList,"bankCard",sysUserVo.getBankCard())){
+            uploadFile(sysUserVo.getBankCard(),"bankCard",userId);
         }
     }
 }

tenant/organization/src/main/resources/mapper/SysOrganizationMapper.xml

@@ -22,14 +22,13 @@
         (SELECT u.username FROM sys_user u WHERE u.id = sys_organization.manager_id) managerName
         from sys_organization
         <where>
-            1=1
-            <if test="params.param != null and params.param != ''">
+            is_delete = 0
+            <if test="params.param != null and params.param.trim() != ''">
                 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>
 

tenant/organization/src/main/resources/mapper/SysUserJzgInfoMapper.xml

@@ -64,7 +64,7 @@
         left join sys_dept sd on sd.id = suji.dept_id
         left join sys_user_role sur on sur.user_id = su.id
         left join sys_role sr on sr.id = sur.role_id
-        left join sys_organization_user_link soul on soul.user_id = suji.id
+        left join sys_organization_user_link soul on soul.user_id = suji.user_id
         left join sys_organization so on so.id = soul.organization_id
         where
         1=1
@@ -98,6 +98,14 @@
             or  suji.id = #{sysUserInfoListVo.salesman})
             or  su.id = #{sysUserInfoListVo.salesman}
         </if>
+        <if test="sysUserInfoListVo.isMember!= null and sysUserInfoListVo.isMember!= ''">
+            <if test="sysUserInfoListVo.isMember == 1">
+                and suji.type_attr = 2
+            </if>
+            <if test="sysUserInfoListVo.isMember == 2">
+                and suji.type_attr != 2
+            </if>
+        </if>
         group by suji.id, soul.organization_id, so.name
         order by suji.create_time desc
     </select>

tenant/organization/src/main/resources/mapper/SysUserRoleMapper.xml

@@ -13,5 +13,9 @@
 
     <delete id="deleteByUserId">
         DELETE FROM sys_user_role WHERE user_id = #{userId}
+        AND role_id IN
+        <foreach collection="roleIds" item="roleId" open="(" close=")" separator=",">
+            #{roleId}
+        </foreach>
     </delete>
 </mapper>