Merge remote-tracking branch 'origin/dev20230707'

dsk-common/src/main/java/com/dsk/common/dtos/OpRegionalEconomicDataRegionalListDto.java

@@ -14,6 +14,12 @@ import javax.validation.constraints.NotNull;
 @Data
 public class OpRegionalEconomicDataRegionalListDto {
 
+    /**
+     * id
+     */
+    @NotNull(message = "id 不能为空")
+    private Integer id;
+
     /**
      * 省Id
      */

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

@@ -349,24 +349,24 @@ export default {
   .app-container{
     height: calc(100vh - 134px)
   }
-.box-card{
-  padding-top: 16px;
-  width: 100%;
-  height: 100%;
-}
-.box{
-  position: relative;
-  >span{
-    position: absolute;
-    right: 10px;
-    bottom: 0;
-    color: #0081FF;
-    cursor: pointer;
-    &:hover{
-      color: #006AD1;
+  .box-card{
+    padding-top: 16px;
+    width: 100%;
+    height: 100%;
+  }
+  .box{
+    position: relative;
+    >span{
+      position: absolute;
+      right: 10px;
+      bottom: 0;
+      color: #0081FF;
+      cursor: pointer;
+      &:hover{
+        color: #006AD1;
+      }
     }
   }
-}
   .dc{
     font-size: 12px;
     color: #3D3D3D;
@@ -397,8 +397,8 @@ export default {
   }
   .tables{
     position: relative;
-    height: calc(100vh - 134px);
-    overflow: auto;
+    min-height: calc(100vh - 134px);
+    /*overflow: auto;*/
     .empty{
       position: absolute;
       top: 50%;
@@ -425,7 +425,7 @@ export default {
         >img{
           float: right;
           margin: 3px 0 0 4px;
-          width: 16px;
+          width: 14px;
         }
         .i{
           display: inline-block;

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

@@ -237,8 +237,16 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
     @Transactional
     public int deleteBusinessInfoByIds(Long[] ids) {
         //删除项目详情，用户关联项目，项目工作代办，项目联系人，项目跟进记录，项目标签，项目相关企业
-        return businessInfoMapper.deleteBusinessInfoByIds(ids);
-        //TODO 删除项目上传的文件
+        int deleteBusiness = businessInfoMapper.deleteBusinessInfoByIds(ids);
+        //删除项目上传的文件
+        for (Long id : ids) {
+            try {
+                FileUtils.delFolder(RuoYiConfig.getUploadPath() + id);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        return deleteBusiness;
     }
 
     /**