Merge remote-tracking branch 'origin/master'

puzhibing

2023-05-16 4e8951a439c03e87568789cedeb62033884412db

 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAppUserController.java

@@ -175,6 +175,7 @@
        EntityWrapper<TAppUser> wrapper = tAppUserService.getUserListWrapper(createTime,nickname,phone,id,status);
        // 是否异常
        wrapper.eq("is_exception",2);
        wrapper.orderBy("createTime",false);
        List<TAppUser> tAppUsers = tAppUserService.selectList(wrapper);

        return tAppUserService.getTAppUserResp(tAppUsers);
@@ -194,6 +195,7 @@
                          Integer status) {
        EntityWrapper<TAppUser> wrapper = tAppUserService.getUserListWrapper(createTime,nickname,phone,id,status);
        wrapper.ne("is_exception",2);
        wrapper.orderBy("createTime",false);
        return tAppUserService.selectList(wrapper);
    }

@@ -311,7 +313,7 @@
                values[i][7] = d.getEmergencyContact();
                values[i][8] = d.getEmergencyPhone();
                values[i][9] = String.valueOf(d.getAccountBalance());
                values[i][10] = String.valueOf(d.getUserTagId());
                values[i][10] = String.valueOf(Objects.nonNull(d.getUserTagId())?d.getUserTagId():"");
                Integer status1 = d.getStatus();
                if(1 == status1){
                    values[i][11] = "正常";