wks 2 years ago
parent
commit
70b6e273c1

+ 0 - 1
sql/Online.sql

@@ -132,5 +132,4 @@ CREATE TABLE `sys_relation_person` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='合伙人/推荐人和机构负责人关系表';
 
 --add by caiyaru 20240813
-ALTER TABLE `sys_user` ADD COLUMN `factor_verify` tinyint  DEFAULT 0 COMMENT '0 未验证 1 已验证';
 ALTER TABLE `sys_user_bank_card` ADD COLUMN `bank_verify` tinyint  DEFAULT 0 COMMENT '0 未验证 1 已验证';

+ 6 - 6
src/main/java/com/ydtech/modules/admin/service/impl/AppCustomerManagementImpl.java

@@ -39,18 +39,18 @@ public class AppCustomerManagementImpl implements AppCustomerManagementService {
 
     @Override
     public HttpResult<BasePageResult<SysUserTeamDto>> authenticationQuery(AppCustomerManagementQueryVo managementQueryVo) {
-        String deptId = new BaseController().getDeptId();
+        String deptId = BaseController.getDeptId();
         SysDept dept = sysDeptService.getById(deptId);
         Page<SysUser> page = new Page<>(managementQueryVo.getPageNum(), managementQueryVo.getPageSize());
-        String userId = new BaseController().getUserId();
+        String userId = BaseController.getUserId();
         if (OrganizationSource.OS_1.getCode().equals(dept.getManagementSource())) {
 
             Page<SysUser> sysUserPage = sysUserService.lambdaQuery()
                     .eq(SysUser::getOperatorCode, userId)
-                    .or(x-> x.eq(StringUtils.isEmpty(managementQueryVo.getCriteria()), SysUser::getMobile, managementQueryVo.getCriteria()))
-                    .or(x-> x.eq(StringUtils.isEmpty(managementQueryVo.getCriteria()), SysUser::getId, managementQueryVo.getCriteria()))
-                    .or(x-> x.eq(StringUtils.isEmpty(managementQueryVo.getCriteria()), SysUser::getName, managementQueryVo.getCriteria()))
-                    .eq(StringUtils.isEmpty(managementQueryVo.getAuthenticationStatus()), SysUser::getName, managementQueryVo.getAuthenticationStatus())
+                    .or(x -> x.eq(StringUtils.isEmpty(managementQueryVo.getCriteria()), SysUser::getMobile, managementQueryVo.getCriteria())
+                            .or().eq(StringUtils.isEmpty(managementQueryVo.getCriteria()), SysUser::getId, managementQueryVo.getCriteria())
+                            .or().eq(StringUtils.isEmpty(managementQueryVo.getCriteria()), SysUser::getName, managementQueryVo.getCriteria()))
+                    .eq(StringUtils.isEmpty(managementQueryVo.getAuthenticationStatus()), SysUser::getStatus, managementQueryVo.getAuthenticationStatus())
                     .page(page);
 
             List<SysUserTeamDto> sysUserTeamDtos = sysUserPage.getRecords().stream().map(SysUserTeamDto::new).collect(Collectors.toList());