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

dsk-admin/src/main/java/com/dsk/web/controller/system/SysUserController.java

@@ -78,7 +78,7 @@ public class SysUserController extends BaseController {
             SysUserExportVo vo = listVo.get(i);
             if (ObjectUtil.isNotEmpty(dept)) {
                 vo.setDeptName(dept.getDeptName());
-                vo.setLeader(dept.getLeader());
+                //vo.setLeader(dept.getLeader());
             }
         }
         ExcelUtil.exportExcel(listVo, "用户数据", SysUserExportVo.class, response);

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-module/dsk-biz-api/src/main/resources/mapper/biz/BusinessInfoMapper.xml

@@ -316,7 +316,7 @@
     </delete>
 
     <delete id="deleteBusinessInfoByIds" parameterType="Long">
-        delete i,b,co,f,l,r,u
+        delete i,b,f,l,r,u
         from business_info i
         left join business_backlog b on b.business_id = i.id
         left join business_follow_record f on f.business_id = i.id

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/index.vue

@@ -186,6 +186,11 @@
           </el-tab-pane>
           <el-tab-pane label="大项目最新招标" name="second">
             <skeleton v-if="zhaobiaoIsSkeleton" style="padding: 16px"></skeleton>
+            <div class="empty" v-if="zbList.length === 0 && !zhaobiaoIsSkeleton">
+              <img class="img" src="@/assets/images/project/empty.png">
+              <div class="p1">抱歉，没找到相关数据</div>
+            </div>
+
             <div v-if="!zhaobiaoIsSkeleton" class="list">
               <div class="item" v-for="(item,index) in zbList" :key="index">
                 <p class="list-title"><router-link :to="`/radar/Notice/details/${item.id}`" tag="a" class="a-link" v-if="item.id" v-html="item.projectName"></router-link></p>

dsk-system/src/main/java/com/dsk/system/domain/SysUser.java

@@ -5,10 +5,9 @@ import com.dsk.common.annotation.Sensitive;
 import com.dsk.common.constant.UserConstants;
 import com.dsk.common.enums.SensitiveStrategy;
 import com.dsk.common.tenant.core.TenantEntity;
+import com.dsk.common.xss.Xss;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.dsk.common.core.domain.BaseEntity;
-import com.dsk.common.xss.Xss;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
@@ -129,6 +128,11 @@ public class SysUser extends TenantEntity {
      */
     private String remark;
 
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
     /**
      * 部门对象
      */
@@ -159,6 +163,7 @@ public class SysUser extends TenantEntity {
     @TableField(exist = false)
     private Long roleId;
 
+
     public SysUser(Long userId) {
         this.userId = userId;
     }

dsk-system/src/main/java/com/dsk/system/domain/vo/SysUserExportVo.java

 package com.dsk.system.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.dsk.common.annotation.ExcelDictFormat;
-import com.dsk.common.convert.ExcelDictConvert;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -20,29 +19,29 @@ import java.util.Date;
 public class SysUserExportVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 用户ID
-     */
-    @ExcelProperty(value = "用户序号")
-    private Long userId;
-
-    /**
-     * 用户账号
-     */
-    @ExcelProperty(value = "登录名称")
-    private String userName;
+    ///**
+    // * 用户ID
+    // */
+    //@ExcelProperty(value = "用户序号")
+    //private Long userId;
+    //
+    ///**
+    // * 用户账号
+    // */
+    //@ExcelProperty(value = "登录名称")
+    //private String userName;
 
     /**
      * 用户昵称
      */
-    @ExcelProperty(value = "用户名称")
+    @ExcelProperty(value = "用户昵称")
     private String nickName;
 
-    /**
-     * 用户邮箱
-     */
-    @ExcelProperty(value = "用户邮箱")
-    private String email;
+    ///**
+    // * 用户邮箱
+    // */
+    //@ExcelProperty(value = "用户邮箱")
+    //private String email;
 
     /**
      * 手机号码
@@ -50,42 +49,50 @@ public class SysUserExportVo implements Serializable {
     @ExcelProperty(value = "手机号码")
     private String phonenumber;
 
-    /**
-     * 用户性别
-     */
-    @ExcelProperty(value = "用户性别", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "sys_user_sex")
-    private String sex;
-
-    /**
-     * 帐号状态（0正常 1停用）
-     */
-    @ExcelProperty(value = "帐号状态", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "sys_normal_disable")
-    private String status;
-
-    /**
-     * 最后登录IP
-     */
-    @ExcelProperty(value = "最后登录IP")
-    private String loginIp;
-
-    /**
-     * 最后登录时间
-     */
-    @ExcelProperty(value = "最后登录时间")
-    private Date loginDate;
+    ///**
+    // * 用户性别
+    // */
+    //@ExcelProperty(value = "用户性别", converter = ExcelDictConvert.class)
+    //@ExcelDictFormat(dictType = "sys_user_sex")
+    //private String sex;
+    //
+    ///**
+    // * 帐号状态（0正常 1停用）
+    // */
+    //@ExcelProperty(value = "帐号状态", converter = ExcelDictConvert.class)
+    //@ExcelDictFormat(dictType = "sys_normal_disable")
+    //private String status;
+    //
+    ///**
+    // * 最后登录IP
+    // */
+    //@ExcelProperty(value = "最后登录IP")
+    //private String loginIp;
+    //
+    ///**
+    // * 最后登录时间
+    // */
+    //@ExcelProperty(value = "最后登录时间")
+    //private Date loginDate;
 
     /**
      * 部门名称
      */
-    @ExcelProperty(value = "部门名称")
+    @ExcelProperty(value = "组织名称")
     private String deptName;
 
+    ///**
+    // * 负责人
+    // */
+    //@ExcelProperty(value = "部门负责人")
+    //private String leader;
+
+
     /**
-     * 负责人
+     * 创建时间
      */
-    @ExcelProperty(value = "部门负责人")
-    private String leader;
+    @ExcelProperty(value = "创建时间")
+    @ColumnWidth(value = 25) // 列宽
+    private Date createTime;
 
 }

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

@@ -231,7 +231,9 @@ public class ISysTenantServiceImpl implements ISysTenantService {
         dictDataMapper.insertBatch(dictDataList);
 
         List<SysConfig> sysConfigList = configMapper.selectList(
-                new LambdaQueryWrapper<SysConfig>().eq(SysConfig::getTenantId, defaultTenantId));
+                new LambdaQueryWrapper<SysConfig>()
+                        .eq(SysConfig::getTenantId, defaultTenantId)
+                        .eq(SysConfig::getConfigType, "Y"));
         for (SysConfig config : sysConfigList) {
             config.setConfigId(null);
             config.setTenantId(tenantId);
@@ -249,7 +251,7 @@ public class ISysTenantServiceImpl implements ISysTenantService {
         //租户新增成功,发送短信通知租户
         LinkedHashMap<String, String> map = new LinkedHashMap<>(1);
         map.put("company", bo.getContactUserName());
-        map.put("pwd",password);
+        map.put("pwd", password);
         SmsBlend smsBlend = SmsFactory.createSmsBlend(SupplierType.ALIBABA);
         SmsResponse smsResponse = smsBlend.sendMessage(bo.getContactPhone(), "SMS_463175230", map);
         if (!"OK".equals(smsResponse.getCode())) {