From 4e4851533fd1963323ca1132273cf8c8c341f272 Mon Sep 17 00:00:00 2001 From: 15004070936 <1097449274@qq.com> Date: Fri, 8 May 2026 14:12:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=EF=BC=9A=E7=A7=9F=E6=88=B7=E8=BF=87=E6=9C=9F=20?= =?UTF-8?q?=E5=9C=BA=E9=A6=86=E8=BF=87=E6=9C=9F=20=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E5=8D=A1=E8=BF=87=E6=9C=9F=20=E5=95=86=E5=9F=8E=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E5=B1=95=E7=A4=BA=E8=BF=87=E6=9C=9F=20=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E6=9B=B4=E6=96=B0=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mall/ProductShowController.java | 12 ++-- .../controller/system/SysUserController.java | 5 +- .../web/service/UserDetailsServiceImpl.java | 17 +++++- .../com/ruoyi/mall/domain/ProductShow.java | 7 ++- .../ruoyi/mall/domain/vo/ProductShowVO.java | 4 ++ .../ruoyi/mall/service/ProductService.java | 4 ++ .../mall/service/ProductShowService.java | 14 +++-- .../ruoyi/quartz/task/ProductShowTask.java | 26 --------- .../java/com/ruoyi/quartz/task/YogaTask.java | 56 +++++++++++++++++++ .../school/member/domain/ScMemberCard.java | 5 +- .../member/mapper/ScMemberCardMapper.java | 8 ++- .../member/service/IScMemberCardService.java | 2 +- .../service/impl/ScMemberCardServiceImpl.java | 34 +++-------- .../ruoyi/system/mapper/SysDeptMapper.java | 2 + .../ruoyi/system/mapper/SysTenantMapper.java | 3 + .../ruoyi/system/service/ISysDeptService.java | 2 + .../system/service/SysTenantService.java | 1 + .../service/impl/SysDeptServiceImpl.java | 10 ++++ .../service/impl/SysTenantServiceImpl.java | 39 +++++++++---- .../service/impl/SysUserServiceImpl.java | 10 ++++ .../mapper/mall/ProductShowMapper.xml | 20 +++++-- .../school/member/ScMemberCardMapper.xml | 13 +++++ .../resources/mapper/system/SysDeptMapper.xml | 10 +++- .../mapper/system/SysTenantMapper.xml | 10 ++++ .../resources/mapper/system/SysUserMapper.xml | 18 ++++-- 25 files changed, 228 insertions(+), 104 deletions(-) delete mode 100644 ruoyi-system/src/main/java/com/ruoyi/quartz/task/ProductShowTask.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/quartz/task/YogaTask.java create mode 100644 ruoyi-system/src/main/resources/mapper/school/member/ScMemberCardMapper.xml diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/mall/ProductShowController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/mall/ProductShowController.java index 125e86c..3e4c730 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/mall/ProductShowController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/mall/ProductShowController.java @@ -41,7 +41,7 @@ public class ProductShowController extends BaseController { @ApiOperation("新增商品申请（租户）") - @PreAuthorize("@ss.hasPermi('pms:publish:list')") + @PreAuthorize("@ss.hasPermi('pms:publishProduct:list')") @PostMapping public ResponseEntity add(@RequestBody ProductShow productShow) { return ResponseEntity.ok(service.insertProductShow(productShow)); @@ -50,14 +50,14 @@ public class ProductShowController extends BaseController { @ApiOperation("修改申请（租户）") - @PreAuthorize("@ss.hasPermi('pms:publish:list')") + @PreAuthorize("@ss.hasPermi('pms:publishProduct:list')") @PutMapping public ResponseEntity edit(@RequestBody ProductShow productShowUpdate) { return ResponseEntity.ok(service.updateProductShow(productShowUpdate)); } @ApiOperation("取消申请/删除（租户）") - @PreAuthorize("@ss.hasPermi('pms:publish:list')") + @PreAuthorize("@ss.hasPermi('pms:publishProduct:list')") @DeleteMapping("/{id}") public ResponseEntity remove(@PathVariable Long id) { return ResponseEntity.ok(service.deleteProductShow(id)); @@ -66,9 +66,9 @@ public class ProductShowController extends BaseController { //拒绝商品展示 @ApiOperation("拒绝商品展示（管理员）") @PreAuthorize("@ss.hasPermi('pms:review:list')") - @PutMapping("/refuse/{id}") - public ResponseEntity refuse(@PathVariable Long id) { - return ResponseEntity.ok(service.refuseProductShow(id)); + @PutMapping("/refuse") + public ResponseEntity refuse(@RequestBody ProductShow productShowUpdate) { + return ResponseEntity.ok(service.refuseProductShow(productShowUpdate.getId())); } //审核通过 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java index 5eb36ae..85df2e0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java @@ -103,7 +103,8 @@ public class SysUserController extends BaseController userService.checkUserDataScope(userId); AjaxResult ajax = AjaxResult.success(); List roles = roleService.selectRoleAll(); - ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList())); +// ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList())); + ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> r.getRoleId()>99l).collect(Collectors.toList())); if (StringUtils.isNotNull(userId)) { List roleIds=roleService.selectRoleListByUserId(userId) ; @@ -221,7 +222,7 @@ public class SysUserController extends BaseController SysUser user = userService.selectUserById(userId); List roles = roleService.selectRolesByUserId(userId); ajax.put("user", user); - ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList())); + ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> r.getRoleId()>99l).collect(Collectors.toList())); return ajax; } diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java index 3f530f3..1eca270 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java @@ -2,12 +2,14 @@ package com.ruoyi.framework.web.service; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.enums.UserStatus; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.domain.SysTenant; +import com.ruoyi.system.service.ISysDeptService; import com.ruoyi.system.service.ISysUserService; import com.ruoyi.system.service.impl.SysTenantServiceImpl; import org.slf4j.Logger; @@ -30,10 +32,11 @@ public class UserDetailsServiceImpl implements UserDetailsService @Autowired private ISysUserService userService; - @Autowired private SysTenantServiceImpl tenantService; @Autowired + private ISysDeptService deptService; + @Autowired private SysPermissionService permissionService; @Override @@ -59,12 +62,20 @@ public class UserDetailsServiceImpl implements UserDetailsService if (ObjectUtil.isEmpty(tenant) || !tenant.getInUse().equals("0") || !DateUtil.date().before(tenant.getEndTime()) - || tenant.getDeleteFlag().equals("1") + || !tenant.getDeleteFlag().equals("0") ){ log.info("用户所属租户：{} 异常.", tenant.getTenantName()); throw new ServiceException("用户所属租户：" + tenant.getTenantName() + " 异常,无法登录！"); } - + SysDept dept= deptService.getById(user.getDeptId()); + if (ObjectUtil.isEmpty(dept) + || !dept.getStatus().equals("0") + || !dept.getDeleteFlag().equals("0") + || !DateUtil.date().before(DateUtil.parse(dept.getExpiryDate())) + ){ + log.info("用户所属场馆：{} 异常.", dept.getDeptName()); + throw new ServiceException("用户所属场馆：" + dept.getDeptName() + " 异常,无法登录！"); + } return createLoginUser(user); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/mall/domain/ProductShow.java b/ruoyi-system/src/main/java/com/ruoyi/mall/domain/ProductShow.java index 69ef0e8..214e140 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/mall/domain/ProductShow.java +++ b/ruoyi-system/src/main/java/com/ruoyi/mall/domain/ProductShow.java @@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import java.time.LocalDate; import java.time.LocalDateTime; +import java.util.Date; /** * 商品商城展示申请表 @@ -26,6 +26,7 @@ public class ProductShow { */ private Long productId; + /** * 场馆ID */ @@ -49,12 +50,12 @@ public class ProductShow { /** * 展示开始时间 */ - private LocalDate showStartTime; + private Date showStartTime; /** * 展示结束时间 */ - private LocalDate showEndTime; + private Date showEndTime; /** * 申请状态（0-待审核（已申请） 1-审核通过 2-审核拒绝 3-展示中 4-展示期结束 ） diff --git a/ruoyi-system/src/main/java/com/ruoyi/mall/domain/vo/ProductShowVO.java b/ruoyi-system/src/main/java/com/ruoyi/mall/domain/vo/ProductShowVO.java index 3723461..a44fdc2 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/mall/domain/vo/ProductShowVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/mall/domain/vo/ProductShowVO.java @@ -9,6 +9,10 @@ public class ProductShowVO extends ProductShow { private String productCategoryName; private String tenantName; private String storeName; + private String outProductId; + private String productCategoryId; + + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/mall/service/ProductService.java b/ruoyi-system/src/main/java/com/ruoyi/mall/service/ProductService.java index 664d441..ddeb228 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/mall/service/ProductService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/mall/service/ProductService.java @@ -101,6 +101,10 @@ public class ProductService extends ServiceImpl implemen if (categoryId != null) { qw.eq("category_id", categoryId); } + Long brandId = query.getBrandId(); + if (categoryId != null) { + qw.eq("brand_id", brandId); + } Integer publishStatus = query.getPublishStatus(); if (publishStatus != null) { qw.eq("publish_status", publishStatus); diff --git a/ruoyi-system/src/main/java/com/ruoyi/mall/service/ProductShowService.java b/ruoyi-system/src/main/java/com/ruoyi/mall/service/ProductShowService.java index 281d828..c04a4fa 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/mall/service/ProductShowService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/mall/service/ProductShowService.java @@ -18,6 +18,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; +import java.util.Date; import java.util.List; /** @@ -40,7 +41,7 @@ public class ProductShowService extends ServiceImpl { /** * 更新会员卡状态 */ - @Select("UPDATE sc_member_cards SET status = #{status}, updated_at = NOW() WHERE id = #{id} AND is_deleted = 0") + @Update("UPDATE sc_member_cards SET status = #{status}, updated_at = NOW() WHERE id = #{id} AND is_deleted = 0") int updateStatus(@Param("id") Long id, @Param("status") String status); /** * 扣减次数 */ - @Select("UPDATE sc_member_cards SET remaining_count = remaining_count - #{count}, updated_at = NOW() WHERE id = #{id} AND remaining_count >= #{count} AND is_deleted = 0") + @Update("UPDATE sc_member_cards SET remaining_count = remaining_count - #{count}, updated_at = NOW() WHERE id = #{id} AND remaining_count >= #{count} AND is_deleted = 0") int deductCount(@Param("id") Long id, @Param("count") Integer count); /** * 增加次数 */ - @Select("UPDATE sc_member_cards SET remaining_count = remaining_count + #{count}, updated_at = NOW() WHERE id = #{id} AND is_deleted = 0") + @Update("UPDATE sc_member_cards SET remaining_count = remaining_count + #{count}, updated_at = NOW() WHERE id = #{id} AND is_deleted = 0") int addCount(@Param("id") Long id, @Param("count") Integer count); + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/member/service/IScMemberCardService.java b/ruoyi-system/src/main/java/com/ruoyi/school/member/service/IScMemberCardService.java index ab31dda..04d863d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/school/member/service/IScMemberCardService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/school/member/service/IScMemberCardService.java @@ -81,7 +81,7 @@ public interface IScMemberCardService extends IService { /** * 批量更新过期状态 */ - int updateExpiredStatus(); + int expiredMemberCard(); /** * 获取今日办理的会员卡数量 diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/member/service/impl/ScMemberCardServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/school/member/service/impl/ScMemberCardServiceImpl.java index ff688d6..9583c7e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/school/member/service/impl/ScMemberCardServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/school/member/service/impl/ScMemberCardServiceImpl.java @@ -133,6 +133,7 @@ public class ScMemberCardServiceImpl extends ServiceImpl expiredCards = this.lambdaQuery() .eq(ScMemberCard::getIsDeleted, 0) @@ -489,11 +490,12 @@ public class ScMemberCardServiceImpl extends ServiceImpl { - card.setStatus(ScMemberCard.CardStatus.EXPIRED.name()); + expiredCards.forEach(expiredCard -> { + expiredCard.setStatus(ScMemberCard.CardStatus.EXPIRED.name()); }); - - return this.updateBatchById(expiredCards) ? expiredCards.size() : 0; + int updatedRows=this.updateBatchById(expiredCards) ? expiredCards.size() : 0; + System.out.println("今天开始的过期会员卡修改状态任务已启动，影响记录数：" + updatedRows); + return updatedRows; } /** @@ -642,27 +644,7 @@ public class ScMemberCardServiceImpl extends ServiceImpl getExpiringCards(Integer days) { -// if (days == null) { -// days = 7; // 默认7天内到期 -// } -// -// LocalDate startDate = LocalDate.now(); -// LocalDate endDate = startDate.plusDays(days); -// -// List cards = this.lambdaQuery() -// .eq(ScMemberCard::getIsDeleted, 0) -// .eq(ScMemberCard::getStatus, ScMemberCard.CardStatus.ACTIVE.name()) -// .ge(ScMemberCard::getExpiryDate, startDate) -// .le(ScMemberCard::getExpiryDate, endDate) -// .orderByAsc(ScMemberCard::getExpiryDate) -// .list(); -// -// return cards.stream() -// .map(this::convertToVO) -// .collect(Collectors.toList()); -// } + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java index b378062..6720eb4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java @@ -119,4 +119,6 @@ public interface SysDeptMapper extends BaseMapper * @return 结果 */ public int deleteDeptById(Long deptId); + + int expireDept(); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysTenantMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysTenantMapper.java index 24e05f0..2d710b9 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysTenantMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysTenantMapper.java @@ -31,4 +31,7 @@ public interface SysTenantMapper extends BaseMapper { SysTenant selectInUseUserTenant(@Param("userId")String userId, @Param("tenantId")String tenantId); int tenantHaveContent(String tenantId); + + int expireTenant(); + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java index 6081163..6ef7d2b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java @@ -119,4 +119,6 @@ public interface ISysDeptService extends IService * @return 结果 */ public int deleteDeptById(Long deptId); + + int expireDept(); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/SysTenantService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysTenantService.java index 822b55f..55d43f2 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/SysTenantService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysTenantService.java @@ -32,4 +32,5 @@ public interface SysTenantService extends IService { RestResponse addTenant(ReqBusinessAddTenant reqBusinessAddTenant); RestResponse updateTenant(SysTenant sysTenant); RestResponse deleteById(String[] tenantIds); + int expireTenant(); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java index 996e44e..e94caab 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java @@ -421,4 +421,14 @@ public class SysDeptServiceImpl extends ServiceImpl imp { return getChildList(list, t).size() > 0 ? true : false; } + + //过期场馆修改状态 (定时器触发事件) + @Transactional + @Override + public int expireDept() { + int updatedRows=baseMapper.expireDept(); + System.out.println("今天开始的过期场馆修改状态任务已启动，影响记录数：" + updatedRows); + return updatedRows; + } + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java index 2d1d08d..58d9997 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java @@ -14,7 +14,6 @@ import com.ruoyi.common.page.RespPage; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.uuid.IdGenerator; import com.ruoyi.system.domain.SysTenant; -import com.ruoyi.system.domain.SysUserRole; import com.ruoyi.system.domain.columns.YjStore; import com.ruoyi.system.domain.vo.ReqBusinessAddTenant; import com.ruoyi.system.domain.vo.ReqSearchSysTenant; @@ -31,7 +30,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; import java.util.Arrays; import java.util.Date; import java.util.List; @@ -160,6 +158,13 @@ public class SysTenantServiceImpl extends ServiceImpl list=new ArrayList<>(); - list.add(userRole); - userRoleMapper.batchUserRole(list); + //角色menu // roleMenuMapper.insertForNewTenant(sysTenant.getTenantId()); @@ -234,7 +236,8 @@ public class SysTenantServiceImpl extends ServiceImpl 0) { return RestResponse.failure("租户下有会员,无法删除"); } + int deptCount = deptMapper.selectCount(new QueryWrapper() + .eq("tenant_id", tenantId) + .eq("delete_flag", "0")); + if (deptCount > 0) { + return RestResponse.failure("租户下有场馆,无法删除"); + } } String joinedString = String.join(",", tenantIds); boolean deleteTenant = this.update(new UpdateWrapper() @@ -264,5 +273,13 @@ public class SysTenantServiceImpl extends ServiceImpl and p.name like concat('%',#{productName},'%') - - and p.name like concat('%',#{productName},'%') + + and p.out_product_id =#{outProductId} + + + and c.id =#{productCategoryId} + + + and c.type_name like concat('%',#{productCategoryName},'%') and s.store_name like concat('%',#{storeName},'%') - + and a.show_flag =#{showFlag} - + and a.apply_status =#{applyStatus} ORDER BY a.apply_time DESC,a.sort ASC @@ -45,11 +52,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" UPDATE mall_product_show SET show_flag = '1', apply_status = '3' - WHERE show_start_time = CURDATE(); + WHERE show_start_time = CURDATE() and apply_status = '1'; + UPDATE mall_product_show SET show_flag = '0', apply_status = '4' - WHERE show_end_time = DATE_SUB(CURDATE(), INTERVAL 1 DAY); + WHERE show_end_time = DATE_SUB(CURDATE(), INTERVAL 1 DAY) and apply_status = '3'; diff --git a/ruoyi-system/src/main/resources/mapper/school/member/ScMemberCardMapper.xml b/ruoyi-system/src/main/resources/mapper/school/member/ScMemberCardMapper.xml new file mode 100644 index 0000000..2d782e3 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/school/member/ScMemberCardMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml index 9e23a69..d7e757c 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -180,7 +180,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update sys_dept set delete_flag = '2' where dept_id = #{deptId} + update sys_dept set delete_flag = '1' where dept_id = #{deptId} - + + UPDATE sys_dept + SET status = '1' + WHERE expiry_date = DATE_SUB(CURDATE(), INTERVAL 1 DAY) + AND status = '0' + and delete_flag = '0'; + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysTenantMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysTenantMapper.xml index 38fd411..60b16ca 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysTenantMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysTenantMapper.xml @@ -20,6 +20,7 @@ and t.in_use='0' and t.delete_flag='0' + + + + UPDATE sys_tenant + SET in_use = '1' + WHERE end_time = DATE_SUB(CURDATE(), INTERVAL 1 DAY) + and in_use='0' + and delete_flag='0'; + + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index 1ed21d9..a487af1 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -231,11 +231,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update sys_user set delelete_flag = '2' where user_id = #{userId} - - update sys_user set delete_flag = '2' where user_id in - - #{userId} - - + + + + + + + + DELETE FROM sys_user where user_id in + + #{userId} + +