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/10 * * * ? ")
     public void updateExpiredTenantStatus() {
         log.info("执行定时禁用已过期租户账号(6h/次)");
         TenantHelper.ignore(tenantService::handleExpiredTenant);

dsk-operate-ui/src/views/custom/component/addCustom.vue

@@ -234,6 +234,7 @@
         });
       },
       toct(){
+        this.dialogVisible = false
         this.$router.push({path:'/macro/urban'})
       },
       //输入数字

dsk-operate-ui/src/views/custom/customList/index.vue

@@ -430,6 +430,7 @@
       }
     },
     toct(){
+      this.dialogVisible = false
       this.$router.push({path:'/macro/urban'})
     },
     getDictType(){

dsk-operate-ui/src/views/custom/historicalCustomers/index.vue

@@ -273,6 +273,7 @@ export default {
       }
     },
     toct(){
+      this.dialogVisible = false
       this.$router.push({path:'/macro/urban'})
     },
     getDictType(){

dsk-operate-ui/src/views/detail/party-a/component/Sidebar.vue

@@ -16,7 +16,7 @@
       class="detail-menu"
       @open="handleOpen">
       <template v-for="(item, index) in sideRoute">
-        <el-submenu :index="index.toString()" v-if="item.children" :disabled="!isCompanyId(item.title)">
+        <el-submenu :index="index.toString()" v-if="item.children" :disabled="!isCompanyId(item.title) || (item.title=='项目商机'&&statisticObj.business.landInfo<1&&statisticObj.business.busProposedProjectV1<1&&statisticObj.performance.specialDebt<1&&statisticObj.performance.bidPlan<1&&statisticObj.business.biddingAnnouncement<1&&statisticObj.business.proBiddingAnnouncement<1&&statisticObj.business.adminLicensing<1)">
           <template slot="title">
             <span>{{item.title}}</span>
           </template>

dsk-operate-ui/src/views/enterpriseManagement/index.vue

@@ -395,6 +395,11 @@
             });
             this.form.startTime = this.form.dateRange[0]
             this.form.expireTime = this.form.dateRange[1]
+            let thistime = new Date(this.form.expireTime).getTime()
+            if(thistime < new Date().getTime()){
+              this.$message.error('不能选择过去时间！')
+              return false
+            }
             if (this.form.id != undefined) {
               editTenant(this.form).then(response => {
                 if (response.code == 200) {

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

@@ -2,6 +2,7 @@ package com.dsk.system.service.impl;
 
 import cn.dev33.satoken.secure.BCrypt;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
@@ -274,6 +275,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
     public int insertUser(SysUser user) {
         String password = PasswordUtils.generatePwd(8);
         user.setPassword(BCrypt.hashpw(password));
+        user.setCreateTime(new DateTime());
         // 新增用户信息
         int rows = baseMapper.insert(user);
         if (rows > 0) {