修改bug

liujie

2026-01-05 294d02d317c9c4842c1eea23227c1817bc11b077

修改bug

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java

@@ -353,6 +353,10 @@
                result.append("第" + i + "行：[", "出生日期" + "]不能为空");
                continue;
            }
            if (!StringUtils.hasLength(appUserImport.getPromotion())) {
                result.append("第" + i + "行：[", "推广权限" + "]不能为空");
                continue;
            }
            if (!StringUtils.hasLength(appUserImport.getRole())) {
                result.append("第" + i + "行：[", "角色" + "]不能为空");
                continue;
@@ -380,6 +384,13 @@
                continue;
            }

            String promotion = appUserImport.getPromotion();
            Integer promotionType = "是".equals(promotion) ? 1 : "否".equals(promotion) ? 0 : null;
            if (promotionType == null) {
                result.append("第" + i + "行：[", "推广权限" + "]格式错误");
                continue;
            }

            String birth = appUserImport.getBirth();
            LocalDate birthday = null;
            try {
@@ -403,6 +414,7 @@
            tAppUser.setGender(gender);
            tAppUser.setBirthday(birthday);
            tAppUser.setUserType(userType);
            tAppUser.setPromotionStatus(promotionType);

            if (appUserImport.getReferrerCode() != null) {
                TAppUser referrerUser = appUserService.getOne(new LambdaQueryWrapper<TAppUser>().eq(TAppUser::getCode, appUserImport.getReferrerCode()).ne(TAppUser::getStatus, 3).last("LIMIT 1"));

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCompanyController.java

@@ -167,8 +167,9 @@
            return R.fail("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
        }
        user.setUserName(company.getAccount());
        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
        user.setPassword(SecurityUtils.encryptPassword(company.getPassword()));
        company.setUpdateUserId(getUserId());
        user.setRoleId(2L);
        int count = userService.updateUser(user);
        if (count > 0) {
            boolean update = companyService.updateById(company);
@@ -331,6 +332,7 @@
        if(StringUtils.isNotEmpty(user.getPassword())){
            user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
        }
        user.setRoleId(2L);
        // 移除之前的二维码
        redisTemplate.delete("ADMIN_WX_IMG" + user.getUserId());
        return R.ok(userService.updateUser(user));

 ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java

@@ -128,6 +128,10 @@
        return passwordEncoder.encode(password);
    }

    public static void main(String[] args) {
        String s = encryptPassword("111111");
        System.out.println(s);
    }
    /**
     * 判断密码是否相同
     *

 ruoyi-system/src/main/java/com/ruoyi/system/export/AppUserImport.java

@@ -29,6 +29,10 @@
    @Excel(name = "角色")
    private String role;

    @ApiModelProperty(value = "是否开启推广权限")
    @Excel(name = "是否开启推广权限")
    private String promotion;

    @ApiModelProperty(value = "推广号")
    @Excel(name = "推广号")
    private String code;

 ruoyi-system/src/main/resources/mapper/system/TRefundApplicationMapper.xml

@@ -21,7 +21,7 @@
        id, big_gift_package_order_id, applicant_user_id, applicant_time, refund_reason, voucher_picture, status, audit_user_id, audit_time, audit_remark
    </sql>
    <select id="pageRefundList" resultType="com.ruoyi.system.model.TBigGiftPackageOrder">
        select t1.id,t2.code,t2.create_time,t3.name userName,t3.phone,t2.order_price,t4.name bigGiftPackageName,t2.payment_type,t2.deposit,t2.final_payment,t1.status auditStatus from t_refund_application t1 left join t_big_gift_package_order t2 on t1.big_gift_package_order_id = t2.id
        select t1.id,t2.code,t2.create_time ,t3.name userName,t3.phone,t2.order_price,t4.name bigGiftPackageName,t2.payment_type,t2.deposit,t2.final_payment,t1.status auditStatus from t_refund_application t1 left join t_big_gift_package_order t2 on t1.big_gift_package_order_id = t2.id
        left join t_app_user t3 on t2.app_user_id = t3.id left join t_big_gift_package t4 on t2.big_gift_package_id = t4.id
        where t1.del_flag = 0
        <if test="query.code != null and query.code != ''">