Merge branch 'zuhuduan' of http://192.168.60.201/root/dsk-operate-sys into zuhuduan

dsk-admin/src/main/java/com/dsk/web/schedule/TenantTimerTask.java

@@ -23,7 +23,7 @@ public class TenantTimerTask {
     /**
      * 每6小时扫描并禁用已过期租户账号
      */
-    @Scheduled(cron = "0 0 0/6 * * *")
+    @Scheduled(cron = "0 0 0/6 * * ?")
     public void updateExpiredTenantStatus() {
         log.info("执行定时禁用已过期租户账号(6h/次)");
         TenantHelper.ignore(tenantService::handleExpiredTenant);

dsk-operate-ui/src/views/project/projectList/component/batchImport.vue

@@ -145,6 +145,7 @@
         a.setAttribute("download", "批量导入模版.xlsx");
         document.body.appendChild(a);
         a.click();
+        a.remove();
       },
       // 批量导入
       importConfirmClick() {

dsk-system/src/main/java/com/dsk/system/service/impl/ISysTenantPackageServiceImpl.java

@@ -151,7 +151,7 @@ public class ISysTenantPackageServiceImpl implements ISysTenantPackageService {
     private void checkPackageIsUsed(List<Long> ids) {
         boolean exists = tenantMapper.exists(new LambdaQueryWrapper<SysTenant>().in(SysTenant::getPackageId, ids));
         if (exists) {
-            throw new ServiceException("租户套餐已被使用");
+            throw new ServiceException("企业方案已被使用");
         }
     }
 

dsk-system/src/main/java/com/dsk/system/service/impl/SysDeptServiceImpl.java

@@ -59,7 +59,7 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService {
                 .eq(ObjectUtil.isNotNull(dept.getDeptId()), SysDept::getDeptId, dept.getDeptId())
                 .eq(ObjectUtil.isNotNull(dept.getParentId()), SysDept::getParentId, dept.getParentId())
                 .like(StringUtils.isNotBlank(dept.getDeptName()), SysDept::getDeptName, dept.getDeptName())
-                .eq(StringUtils.isNotBlank(dept.getStatus()), SysDept::getStatus, dept.getStatus())
+                .eq(SysDept::getStatus, 0)
                 .orderByAsc(SysDept::getParentId)
                 .orderByAsc(SysDept::getOrderNum);
         return baseMapper.selectDeptList(lqw);

dsk-system/src/main/java/com/dsk/system/service/impl/SysMenuServiceImpl.java

@@ -64,16 +64,16 @@ public class SysMenuServiceImpl implements ISysMenuService {
         if (LoginHelper.isSuperAdmin(userId)) {
             menuList = baseMapper.selectList(new LambdaQueryWrapper<SysMenu>()
                     .like(StringUtils.isNotBlank(menu.getMenuName()), SysMenu::getMenuName, menu.getMenuName())
-                    .eq(StringUtils.isNotBlank(menu.getVisible()), SysMenu::getVisible, menu.getVisible())
-                    .eq(StringUtils.isNotBlank(menu.getStatus()), SysMenu::getStatus, menu.getStatus())
+                    .eq(SysMenu::getVisible, 0)
+                    .eq(SysMenu::getStatus, 0)
                     .orderByAsc(SysMenu::getParentId)
                     .orderByAsc(SysMenu::getOrderNum));
         } else {
             QueryWrapper<SysMenu> wrapper = Wrappers.query();
             wrapper.eq("sur.user_id", userId)
                     .like(StringUtils.isNotBlank(menu.getMenuName()), "m.menu_name", menu.getMenuName())
-                    .eq(StringUtils.isNotBlank(menu.getVisible()), "m.visible", menu.getVisible())
-                    .eq(StringUtils.isNotBlank(menu.getStatus()), "m.status", menu.getStatus())
+                    .eq("m.visible", 0)
+                    .eq("m.status", 0)
                     .orderByAsc("m.parent_id")
                     .orderByAsc("m.order_num");
             menuList = baseMapper.selectMenuListByUserId(wrapper);
@@ -153,7 +153,7 @@ public class SysMenuServiceImpl implements ISysMenuService {
         if (LoginHelper.isSuperAdmin(userId)) {
             //Sass超管
             menus = baseMapper.selectMenuTreeAll();
-        }else {
+        } else {
             //租户下的员工
             menus = baseMapper.selectMenuTreeByUserId(userId);
         }