Merge remote-tracking branch 'origin/master'

jiangping

2025-06-30 e8a050f2e5e9f868b16971b2facba4024d81abbe

 server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java

@@ -260,6 +260,7 @@
                .eq(SystemUser::getDeleted,Constants.ZERO)
                .leftJoin(Company.class,Company::getId,SystemUser::getCompanyId)
                .leftJoin(Member.class,Member::getId,SystemUser::getMemberId)
                .leftJoin(" position p on p.id = t2.POSITION_ID ")
                .and(StringUtils.isNotBlank(systemUser.getUsername()),ms->ms.like(SystemUser::getUsername,systemUser.getUsername())
                        .or().like(SystemUser::getMobile,systemUser.getUsername())
                        .or().like(SystemUser::getRealname,systemUser.getUsername()))
@@ -275,7 +276,8 @@
                .like(StringUtils.isNotBlank(systemUser.getUsername()),SystemUser::getUsername,systemUser.getUsername())
                .like(StringUtils.isNotBlank(systemUser.getCompanyName()),Company::getName,systemUser.getCompanyName())
                .apply(StringUtils.isNotBlank(systemUser.getCompanySpecialId())," find_in_set('"+systemUser.getCompanySpecialId()+"',REPLACE(t1.company_path,'/',','))")
                .orderByAsc( Company::getPinyin )
                .orderByAsc( Company::getSortnum )
                .orderByAsc( " p.SORTNUM " )
                .orderByAsc(SystemUser::getPinyin)
         ;
        List<SystemUser> result = systemUserJoinMapper.selectJoinList( SystemUser.class, wrapper);
@@ -302,9 +304,12 @@
        MPJLambdaWrapper<SystemUser> queryWrapper = new MPJLambdaWrapper<>();
        queryWrapper.selectAll(SystemUser.class);
        queryWrapper.eq(SystemUser::getDeleted, Constants.ZERO);
        queryWrapper.leftJoin(Company.class,Company::getId,SystemUser::getCompanyId);
        queryWrapper.eq(Company::getType,Constants.ONE);
        queryWrapper.orderByAsc(SystemUser::getPinyin);
        queryWrapper.leftJoin(Company.class,Company::getId,SystemUser::getCompanyId)
                .leftJoin(" position p on p.id = t2.POSITION_ID ");
        queryWrapper.eq(Company::getType,Constants.ONE)
        .orderByAsc( Company::getSortnum )
        .orderByAsc( " p.SORTNUM " )
        .orderByAsc(SystemUser::getPinyin);
        List<SystemUser> result = systemUserJoinMapper.selectJoinList( SystemUser.class, queryWrapper);
        return result;
    }