Merge remote-tracking branch 'origin/master'

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/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;
     }
 

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/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/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->{
@@ -615,10 +615,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;
     }
 
     /**
@@ -627,7 +630,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;
             }
@@ -643,34 +646,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",sfz2)){
-            uploadFile(sfz2,"sfz2",userId);
+        if(checkFileModify(fileList,"sfz2",sysUserVo.getSfz2())){
+            uploadFile(sysUserVo.getSfz2(),"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/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
@@ -97,6 +97,14 @@
             or  su.mobile = #{sysUserInfoListVo.salesman}
             or  suji.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>