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

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

+package com.dsk.web.controller.system;
+
+
+import com.dsk.common.core.controller.BaseController;
+import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.system.service.SysRegionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 地区信息
+ *
+ * @author lcl
+ * @create 2023/6/28
+ */
+@RestController
+@RequestMapping("/system/region")
+public class SysRegionController extends BaseController {
+
+    @Autowired
+    private SysRegionService baseService;
+
+    /**
+     * 通过父id获取下级地区信息
+     */
+    @GetMapping("/list/{parentId}")
+    public AjaxResult listByParentId(@PathVariable Integer parentId) {
+        return AjaxResult.success(baseService.selectByParentId(parentId));
+    }
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseAffiliatesBody.java

@@ -21,7 +21,6 @@ public class EnterpriseAffiliatesBody extends BasePage {
 
     private Integer hasBid;
 
-    @AssertFalse(message = "企业不存在")
     public boolean isVaildCid() {
         return 0 == cid;
     }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBestStockPageBody.java

@@ -23,7 +23,6 @@ public class EnterpriseBestStockPageBody extends BasePage
     //是否历史 0 否  1 是
     private Integer isHistory;
 
-    @AssertFalse(message = "企业不存在")
     public boolean isVaildCid() {
         return 0 == cid;
     }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBidDataGroupBody.java

@@ -26,7 +26,6 @@ public class EnterpriseBidDataGroupBody
     @NotNull(message = "spanId不能为空")
     private Integer spanId;
 
-    @AssertFalse(message = "企业不存在")
     public boolean isVaildCid() {
         return 0 == cid;
     }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBidNoticePageBody.java

@@ -31,7 +31,6 @@ public class EnterpriseBidNoticePageBody extends BasePage
      */
     private Integer provinceId;
 
-    @AssertFalse(message = "企业不存在")
     public boolean isVaildCid() {
         return 0 == companyId;
     }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBidNoticeProvinceBody.java

@@ -20,7 +20,6 @@ public class EnterpriseBidNoticeProvinceBody
     @NotNull(message = "企业id不能为空")
     private Integer companyId;
 
-    @AssertFalse(message = "企业不存在")
     public boolean isVaildCid() {
         return 0 == companyId;
     }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBidNoticeTenderStageBody.java

@@ -20,7 +20,6 @@ public class EnterpriseBidNoticeTenderStageBody
     @NotNull(message = "企业id不能为空")
     private Integer companyId;
 
-    @AssertFalse(message = "企业不存在")
     public boolean isVaildCid() {
         return 0 == companyId;
     }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBondCreditRatingBody.java

@@ -20,7 +20,6 @@ public class EnterpriseBondCreditRatingBody
     @NotNull(message = "企业id不能为空")
     private Integer cid;
 
-    @AssertFalse(message = "企业不存在")
     public boolean isVaildCid() {
         return 0 == cid;
     }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBussinessBidCooperatePageBody.java

@@ -30,7 +30,6 @@ public class EnterpriseBussinessBidCooperatePageBody extends BasePage {
      */
     private String keys;
 
-    @AssertFalse(message = "企业不存在")
     public boolean isVaildCid() {
         return 0 == tendereeId || 0 == agencyId;
     }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBussinessClientPageBody.java

@@ -32,7 +32,6 @@ public class EnterpriseBussinessClientPageBody extends BasePage {
      */
     private Integer sort;
 
-    @AssertFalse(message = "企业不存在")
     public boolean isVaildCid() {
         return 0 == cid;
     }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBussinessClientProjectPageBody.java

@@ -31,7 +31,6 @@ public class EnterpriseBussinessClientProjectPageBody extends BasePage {
     private String keys;
 
 
-    @AssertFalse(message = "企业不存在")
     public boolean isVaildCid() {
         return 0 == cid || 0 == unitId;
     }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBussinessHistorySendPageBody.java

@@ -54,7 +54,6 @@ public class EnterpriseBussinessHistorySendPageBody extends BasePage {
      */
     private Double amountMax;
 
-    @AssertFalse(message = "企业不存在")
     public boolean isVaildCid() {
         return 0 == cid;
     }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBussinessHistorySendProvinceBody.java

@@ -18,7 +18,7 @@ public class EnterpriseBussinessHistorySendProvinceBody {
      */
     @NotNull(message = "企业id不能为空")
     private Integer cid;
-    @AssertFalse(message = "企业不存在")
+
     public boolean isVaildCid() {
         return 0 == cid;
     }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBussinessOftenAgencyPageBody.java

@@ -31,7 +31,6 @@ public class EnterpriseBussinessOftenAgencyPageBody extends BasePage {
      */
     private Integer sort;
 
-    @AssertFalse(message = "企业不存在")
     public boolean isVaildCid() {
         return 0 == cid;
     }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBussinessSupplierPageBody.java

@@ -31,7 +31,6 @@ public class EnterpriseBussinessSupplierPageBody extends BasePage {
      */
     private Integer sort;
 
-    @AssertFalse(message = "企业不存在")
     public boolean isVaildCid() {
         return 0 == cid;
     }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBussinessSupplierProjectPageBody.java

@@ -31,7 +31,6 @@ public class EnterpriseBussinessSupplierProjectPageBody extends BasePage {
     private String keys;
 
 
-    @AssertFalse(message = "企业不存在")
     public boolean isVaildCid() {
         return 0 == cid || 0 == unitId;
     }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBussinessTenderPageBody.java

@@ -26,7 +26,6 @@ public class EnterpriseBussinessTenderPageBody extends BasePage {
     private String keys;
 
 
-    @AssertFalse(message = "企业不存在")
     public boolean isVaildCid() {
         return 0 == cid;
     }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseChangeInfoBody.java

@@ -21,7 +21,6 @@ public class EnterpriseChangeInfoBody extends BasePage
     private Integer cid;
 
 
-    @AssertFalse(message = "企业不存在")
     public boolean isVaildCid() {
         return 0 == cid;
     }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditAbnormalPageBody.java

@@ -26,7 +26,6 @@ public class EnterpriseCreditAbnormalPageBody extends BasePage {
     private List<String> years;
 
 
-    @AssertFalse(message = "企业不存在")
     public boolean isVaildCid() {
         return 0 == cid;
     }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditAbnormalYearsBody.java

@@ -20,8 +20,6 @@ public class EnterpriseCreditAbnormalYearsBody {
     @NotNull(message = "企业id不能为空")
     private Integer cid;
 
-
-    @AssertFalse(message = "企业不存在")
     public boolean isVaildCid() {
         return 0 == cid;
     }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditExecutedPageBody.java

@@ -27,7 +27,6 @@ public class EnterpriseCreditExecutedPageBody extends BasePage {
      */
     private String dateTo;
 
-    @AssertFalse(message = "企业不存在")
     public boolean isVaildCid() {
         return 0 == cid;
     }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditExecutedPersonsPageBody.java

@@ -29,7 +29,6 @@ public class EnterpriseCreditExecutedPersonsPageBody extends BasePage {
      */
     private String dateTo;
 
-    @AssertFalse(message = "企业不存在")
     public boolean isVaildCid() {
         return 0 == cid;
     }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditKaitingCauseActionBody.java

@@ -20,7 +20,6 @@ public class EnterpriseCreditKaitingCauseActionBody {
     private Integer cid;
 
 
-    @AssertFalse(message = "企业不存在")
     public boolean isVaildCid() {
         return 0 == cid;
     }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditKaitingPageBody.java

@@ -45,7 +45,6 @@ public class EnterpriseCreditKaitingPageBody extends BasePage {
     private String dateTo;
 
 
-    @AssertFalse(message = "企业不存在")
     public boolean isVaildCid() {
         return 0 == cid;
     }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditKaitingPureRoleBody.java

@@ -19,7 +19,6 @@ public class EnterpriseCreditKaitingPureRoleBody {
     @NotNull(message = "企业id不能为空")
     private Integer cid;
 
-    @AssertFalse(message = "企业不存在")
     public boolean isVaildCid() {
         return 0 == cid;
     }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditLawsuitsCauseActionBody.java

@@ -19,7 +19,6 @@ public class EnterpriseCreditLawsuitsCauseActionBody {
     @NotNull(message = "企业id不能为空")
     private Integer cid;
 
-    @AssertFalse(message = "企业不存在")
     public boolean isVaildCid() {
         return 0 == cid;
     }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditLawsuitsPageBody.java

@@ -42,7 +42,6 @@ public class EnterpriseCreditLawsuitsPageBody extends BasePage {
      */
     private String dateTo;
 
-    @AssertFalse(message = "企业不存在")
     public boolean isVaildCid() {
         return 0 == cid;
     }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditLawsuitsRoleBody.java

@@ -19,7 +19,6 @@ public class EnterpriseCreditLawsuitsRoleBody {
     @NotNull(message = "企业id不能为空")
     private Integer cid;
 
-    @AssertFalse(message = "企业不存在")
     public boolean isVaildCid() {
         return 0 == cid;
     }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditNoticeCaseReasonBody.java

@@ -19,7 +19,6 @@ public class EnterpriseCreditNoticeCaseReasonBody {
     @NotNull(message = "企业id不能为空")
     private Integer cid;
 
-    @AssertFalse(message = "企业不存在")
     public boolean isVaildCid() {
         return 0 == cid;
     }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditNoticePageBody.java

@@ -44,7 +44,6 @@ public class EnterpriseCreditNoticePageBody extends BasePage {
      */
     private String dateTo;
 
-    @AssertFalse(message = "企业不存在")
     public boolean isVaildCid() {
         return 0 == cid;
     }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditNoticeRoleBody.java

@@ -19,7 +19,6 @@ public class EnterpriseCreditNoticeRoleBody {
     @NotNull(message = "企业id不能为空")
     private Integer cid;
 
-    @AssertFalse(message = "企业不存在")
     public boolean isVaildCid() {
         return 0 == cid;
     }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditNoticeTypeBody.java

@@ -19,7 +19,6 @@ public class EnterpriseCreditNoticeTypeBody {
     @NotNull(message = "企业id不能为空")
     private Integer cid;
 
-    @AssertFalse(message = "企业不存在")
     public boolean isVaildCid() {
         return 0 == cid;
     }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditPenalizePageBody.java

@@ -30,7 +30,6 @@ public class EnterpriseCreditPenalizePageBody extends BasePage {
     private String keys;
 
 
-    @AssertFalse(message = "企业不存在")
     public boolean isVaildCid() {
         return 0 == cid;
     }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditPenalizeReasonTypeBody.java

@@ -20,7 +20,6 @@ public class EnterpriseCreditPenalizeReasonTypeBody {
     private Integer cid;
 
 
-    @AssertFalse(message = "企业不存在")
     public boolean isVaildCid() {
         return 0 == cid;
     }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseDynamicPageBody.java

@@ -21,7 +21,6 @@ public class EnterpriseDynamicPageBody extends BasePage
     private Integer companyId;
 
 
-    @AssertFalse(message = "企业不存在")
     public boolean isVaildCid() {
         return 0 == companyId;
     }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseFinancialBody.java

@@ -21,7 +21,6 @@ public class EnterpriseFinancialBody
     private Integer cid;
 
 
-    @AssertFalse(message = "企业不存在")
     public boolean isVaildCid() {
         return 0 == cid;
     }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseIcInfoBody.java

@@ -21,7 +21,6 @@ public class EnterpriseIcInfoBody extends BasePage
     private Integer cid;
 
 
-    @AssertFalse(message = "企业不存在")
     public boolean isVaildCid() {
         return 0 == cid;
     }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseInfoHeaderBody.java

@@ -21,7 +21,6 @@ public class EnterpriseInfoHeaderBody
     @NotNull(message = "企业id不能为空")
     private Integer companyId;
 
-    @AssertFalse(message = "企业不存在")
     public boolean isVaildCid() {
         return 0 == companyId;
     }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseInvestmentBody.java

@@ -22,7 +22,6 @@ public class EnterpriseInvestmentBody extends BasePage {
     private double stockPercentageMin;
     private double stockPercentageMax;
 
-    @AssertFalse(message = "企业不存在")
     public boolean isVaildCid() {
         return 0 == cid;
     }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseKeymembersBody.java

@@ -20,7 +20,6 @@ public class EnterpriseKeymembersBody extends BasePage
     @NotNull(message = "企业id不能为空")
     private Integer cid;
 
-    @AssertFalse(message = "企业不存在")
     public boolean isVaildCid() {
         return 0 == cid;
     }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterprisePartnersBody.java

@@ -19,7 +19,6 @@ public class EnterprisePartnersBody extends BasePage {
     @NotNull(message = "企业id不能为空")
     private Integer cid;
 
-    @AssertFalse(message = "企业不存在")
     public boolean isVaildCid() {
         return 0 == cid;
     }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseProjectApprovalProjectPageBody.java

@@ -32,7 +32,6 @@ public class EnterpriseProjectApprovalProjectPageBody extends BasePage {
     private Integer sort;
 
 
-    @AssertFalse(message = "企业不存在")
     public boolean isVaildCid() {
         return 0 == cid;
     }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseProjectBidNoticeAreaBody.java

@@ -20,7 +20,6 @@ public class EnterpriseProjectBidNoticeAreaBody {
     private Integer cid;
 
 
-    @AssertFalse(message = "企业不存在")
     public boolean isVaildCid() {
         return 0 == cid;
     }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseProjectBidNoticePageBody.java

@@ -51,7 +51,6 @@ public class EnterpriseProjectBidNoticePageBody extends BasePage {
     private List<Integer> areaIds;
 
 
-    @AssertFalse(message = "企业不存在")
     public boolean isVaildCid() {
         return 0 == cid;
     }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseProjectBidNoticeProAssessmentWayBody.java

@@ -20,7 +20,6 @@ public class EnterpriseProjectBidNoticeProAssessmentWayBody {
     private Integer cid;
 
 
-    @AssertFalse(message = "企业不存在")
     public boolean isVaildCid() {
         return 0 == cid;
     }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseProjectBidNoticeProPageBody.java

@@ -41,7 +41,6 @@ public class EnterpriseProjectBidNoticeProPageBody extends BasePage {
     private String bidAssessmentWay;
 
 
-    @AssertFalse(message = "企业不存在")
     public boolean isVaildCid() {
         return 0 == cid;
     }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseProjectBidNoticeProProjectPurposesBody.java

@@ -20,7 +20,6 @@ public class EnterpriseProjectBidNoticeProProjectPurposesBody {
     private Integer cid;
 
 
-    @AssertFalse(message = "企业不存在")
     public boolean isVaildCid() {
         return 0 == cid;
     }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseProjectBidNoticeProProjectTypeBody.java

@@ -20,7 +20,6 @@ public class EnterpriseProjectBidNoticeProProjectTypeBody {
     private Integer cid;
 
 
-    @AssertFalse(message = "企业不存在")
     public boolean isVaildCid() {
         return 0 == cid;
     }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseProjectBidNoticeTenderStageBody.java

@@ -21,7 +21,6 @@ public class EnterpriseProjectBidNoticeTenderStageBody {
     private Integer cid;
 
 
-    @AssertFalse(message = "企业不存在")
     public boolean isVaildCid() {
         return 0 == cid;
     }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseProjectBidPlanPageBody.java

@@ -30,7 +30,6 @@ public class EnterpriseProjectBidPlanPageBody extends BasePage {
      */
     private Integer sort;
 
-    @AssertFalse(message = "企业不存在")
     public boolean isVaildCid() {
         return 0 == cid;
     }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseProjectCreditXzxkPageBody.java

@@ -24,7 +24,6 @@ public class EnterpriseProjectCreditXzxkPageBody extends BasePage {
      */
     private String keys;
 
-    @AssertFalse(message = "企业不存在")
     public boolean isVaildCid() {
         return 0 == cid;
     }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseProjectLandTransactionPageBody.java

@@ -37,7 +37,6 @@ public class EnterpriseProjectLandTransactionPageBody extends BasePage {
     private Integer sort;
 
 
-    @AssertFalse(message = "企业不存在")
     public boolean isVaildCid() {
         return 0 == cid;
     }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseProjectLandUseBody.java

@@ -21,7 +21,6 @@ public class EnterpriseProjectLandUseBody  {
     private Integer cid;
 
 
-    @AssertFalse(message = "企业不存在")
     public boolean isVaildCid() {
         return 0 == cid;
     }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseProjectSpecialDebtProjectPageBody.java

@@ -29,4 +29,7 @@ public class EnterpriseProjectSpecialDebtProjectPageBody extends BasePage {
      */
     private Integer sort;
 
+    public boolean isVaildCid() {
+        return 0 == cid;
+    }
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseProjectTenderDataGroupBody.java

@@ -23,7 +23,6 @@ public class EnterpriseProjectTenderDataGroupBody {
     private Integer type;
 
 
-    @AssertFalse(message = "企业不存在")
     public boolean isVaildCid() {
         return 0 == cid;
     }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseStatisticBody.java

@@ -22,7 +22,6 @@ public class EnterpriseStatisticBody
     private Boolean isFy = false;
 
 
-    @AssertFalse(message = "企业不存在")
     public boolean isVaildCid() {
         return 0 == companyId;
     }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseSupplierPageBody.java

@@ -42,7 +42,6 @@ public class EnterpriseSupplierPageBody extends BasePage {
         return sb.toString();
     }
 
-    @AssertFalse(message = "企业不存在")
     public boolean isVaildCid() {
         return 0 == companyId;
     }

dsk-operate-ui/public/index.html

@@ -197,12 +197,12 @@
   </head>
   <body>
     <div id="app">
-	    <div id="loader-wrapper">
+<!--	    <div id="loader-wrapper">
 		    <div id="loader"></div>
 		    <div class="loader-section section-left"></div>
 		    <div class="loader-section section-right"></div>
 		    <div class="load_title">正在加载系统资源，请耐心等待</div>
-        </div>
+      </div>-->
 	</div>
   </body>
 </html>

dsk-operate-ui/src/assets/json/provinceTree.json

@@ -15848,7 +15848,7 @@
         "label": "澳门特别行政区"
     },
     {
-        "value": "830100",
-        "lable": "钓鱼岛"
+      "id": 900000,
+      "label": "钓鱼岛"
     }
-]
+]
\ No newline at end of file

dsk-operate-ui/src/assets/styles/ruoyi.scss

@@ -104,7 +104,7 @@
 /** 表格布局 **/
 .pagination-container {
 	position: relative;
-	height: 25px;
+	height: 50px;
 	margin-bottom: 10px;
 	margin-top: 15px;
 	padding: 10px 20px !important;

dsk-operate-ui/src/plugins/download.js

@@ -72,7 +72,6 @@ export default {
       data: params,
       headers: { 'Authorization': 'Bearer ' + getToken() }
     }).then(res => {
-      console.log(res)
       const blob = new Blob([res.data], { type: 'application/octet-stream/pdf/doc/xlsx/xls/docx' })
       this.saveAs(blob, decodeURI(res.headers['download-filename']))
     })

dsk-operate-ui/src/utils/request.js

@@ -49,7 +49,7 @@ service.interceptors.request.use(config => {
       const s_url = sessionObj.url;                  // 请求地址
       const s_data = sessionObj.data;                // 请求数据
       const s_time = sessionObj.time;                // 请求时间
-      const interval = 1000;                         // 间隔时间(ms)，小于此时间视为重复提交
+      const interval = 200;                         // 间隔时间(ms)，小于此时间视为重复提交
       if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) {
         const message = '数据正在处理，请勿重复提交';
         console.warn(`[${s_url}]: ` + message)

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

@@ -48,7 +48,7 @@
                 <div class="wordprimary ps2" @click="toDetail(scope.row,'')">{{scope.row.companyName}}</div>
                 <div class="ps3">
                   <div  @click="toDetail(scope.row,'gjjl')">写跟进<img src="@/assets/images/project/edit_1.png"></div>
-                  <div  @click="toDetail(scope.row,'preference')">编辑信息<img src="@/assets/images/project/edit_2.png"></div>
+                  <div  @click="toDetail(scope.row,'business')">编辑信息<img src="@/assets/images/project/edit_2.png"></div>
                 </div>
               </div>
             </template>
@@ -120,7 +120,7 @@
               prop="isMajor"
               label="局级大客户" width="88">
               <template slot-scope="scope">
-                <span v-if="scope.row.isMajor">
+                <span v-if="scope.row.isMajor != null">
                 {{scope.row.isMajor == 1?"是":"否"}}
                 </span>
                 <span v-else>--</span>
@@ -154,18 +154,22 @@
                 <div class="wordprimary">{{scope.row.superCompany || '--'}}</div>
               </template>
             </el-table-column>
-            <el-table-column
+            <el-table-column :key="keys"
               prop="mainBusiness"
-              label="主营业务" width="120">
+              label="主营业务" width="400">
               <template slot-scope="scope">
-                {{scope.row.mainBusiness || '--'}}
+                <div v-if="scope.row.mainBusiness == null || scope.row.mainBusiness == ''">--</div>
+                <div class="box"  v-else-if="scope.row.sq1==true">{{scope.row.mainBusiness1}}...<span @click="sq1(scope.row,false)">更多</span></div>
+                <div class="box"  v-else>{{scope.row.mainBusiness}}<span @click="sq1(scope.row,true)">收起</span></div>
               </template>
             </el-table-column>
             <el-table-column
-              prop="companyAttribute"
-              label="发包属性" width="120">
+              prop="companyAttribute" :key="keys+2"
+              label="发包属性" width="400">
               <template slot-scope="scope">
-                {{scope.row.companyAttribute || '--'}}
+                <div v-if="scope.row.companyAttribute == null || scope.row.companyAttribute == ''">--</div>
+                <div class="box"  v-else-if="scope.row.sq2==true">{{scope.row.companyAttribute1}}...<span @click="sq2(scope.row,false)">更多</span></div>
+                <div class="box"  v-else>{{scope.row.companyAttribute}}<span @click="sq2(scope.row,true)">收起</span></div>
               </template>
             </el-table-column>
             <el-table-column
@@ -292,6 +296,7 @@ export default {
       },
       // isNew:true,
       showlist:false,
+      keys:1,
     }
   },
   created() {
@@ -300,6 +305,18 @@ export default {
     this.prvinceTree()
   },
   methods:{
+    sq1(item,sq){
+      this.$nextTick(()=>{
+        item.sq1 = sq
+        this.keys++ ;
+      })
+    },
+    sq2(item,sq){
+      this.$nextTick(()=>{
+        item.sq2 = sq
+        this.keys++ ;
+      })
+    },
     handleALL(event){
       var one = document.getElementById("box");
       if(one){
@@ -327,6 +344,20 @@ export default {
     getCustomerList(){
       getCustomerList(this.searchParam).then(result=>{
         this.tableData = result
+        this.tableData.rows.forEach(item=>{
+          if(item.mainBusiness != "" && item.mainBusiness != null && item.mainBusiness.length>84){
+            item.mainBusiness1 = item.mainBusiness.substring(0,81)
+            item.sq1 = true
+          }else{
+            item.sq1 = false
+          }
+          if(item.companyAttribute != "" && item.companyAttribute != null && item.companyAttribute.length>84){
+            item.companyAttribute1 = item.companyAttribute.substring(0,81)
+            item.sq2 = true
+          }else{
+            item.sq2 = false
+          }
+      })
       })
     },
     //跳转到客户详情
@@ -385,7 +416,6 @@ export default {
       }
     },
     selCompany(item){
-      console.log(item)
       this.queryParam.companyId = item.jskEid
       this.queryParam.companyName = item.name.replace(/<[^>]+>/g, '')
       this.queryParam.legalPerson = item.legalPerson
@@ -507,7 +537,19 @@ export default {
   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;
@@ -539,6 +581,7 @@ export default {
   .tables{
     position: relative;
     height: calc(100vh - 134px);
+    overflow: auto;
     .empty{
       position: absolute;
       top: 50%;

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

@@ -51,5 +51,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-
+.noborder{
+  margin-bottom: 0;
+}
 </style>

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

@@ -4,13 +4,15 @@
       placeholder="搜索"
       class="side-input"
       v-model="searchText"
-      @keyup.enter.native="handleSearch">
-      <i slot="prefix" class="el-input__icon el-icon-search" @click="handleSearch"></i>
+      clearable
+      @input="handleSearch(true)"
+      @keyup.enter.native="handleSearch()">
+      <i slot="prefix" class="el-input__icon el-icon-search" @click="handleSearch()"></i>
     </el-input>
     <el-menu
       ref="sideMenu"
       :unique-opened="true"
-      :default-active="routeIndex"
+      :default-active="searchIndex?searchIndex:routeIndex"
       class="detail-menu"
       @open="handleOpen">
       <template v-for="(item, index) in sideRoute">
@@ -96,6 +98,7 @@ export default {
         {title: '决策链条', pathName: 'decisionMaking'},
         {title: '跟进记录', pathName: 'gjjl'}
       ],
+      defaultRoute: [],
       customer:[
         'business',
         'preference',
@@ -103,6 +106,7 @@ export default {
         'decisionMaking',
         'gjjl'
       ],
+      searchIndex: ''
     }
   },
   computed: {
@@ -111,7 +115,7 @@ export default {
       if(this.partBoxHeight<bowerHeight) {
         sideHeight = bowerHeight
       }else{
-        sideHeight = this.partBoxHeight
+        sideHeight = '1222'/*this.partBoxHeight*/
       }
       return sideHeight
     },
@@ -121,25 +125,35 @@ export default {
     }
   },
   created() {
+    this.defaultRoute = JSON.parse(JSON.stringify(this.sideRoute))
   },
   methods: {
     handleOpen(key, keyPath) {
-      console.log(key, keyPath)
+
     },
     handleItem(item){
       this.$emit("currentPath", item)
     },
-    handleSearch(){
-      if(this.searchText){
+    handleSearch(flag){
+      if((this.searchText&&!flag) || (!this.searchText&&flag)){
         let idx = this.getRouteIdx(this.searchText)
-        if(idx&&idx.includes('-')){
-          let openIdx = idx.slice(0, 1)
-          this.$refs.sideMenu.open(openIdx)
+        if(idx){
+          if(idx.includes('-')){
+            let openIdx = idx.slice(0, 1)
+            this.sideRoute = [this.defaultRoute[openIdx]]
+            this.$refs.sideMenu.open(openIdx)
+          }else{
+            this.sideRoute = [this.defaultRoute[idx]]
+          }
+          this.searchIndex = '-1'
+        }else{
+          this.sideRoute = this.defaultRoute
+          this.searchIndex = ''
         }
       }
     },
     getRouteIdx(pathTitle, pathName){
-      let idx = '', sideArr = this.sideRoute
+      let idx = '', sideArr = this.sideRoute==this.defaultRoute?this.sideRoute:this.defaultRoute
       for(let i=0; i < sideArr.length; i++){
         if(sideArr[i].title == pathTitle || sideArr[i].pathName == pathName){
           idx = i.toString()

dsk-operate-ui/src/views/detail/party-a/cooperate/index.vue

@@ -76,9 +76,9 @@
                   </el-form-item>
                 </div>
                 <div class="elcol">
-                  <el-form-item label="项目类型：" prop="projectType">
-                    <el-select v-model="addParam.projectType" style="width: 175px" class="form-content-width" placeholder="请选择项目类型">
-                      <el-option v-for="(item, index) in projectType" :key="index" :label="item.dictLabel" :value="item.dictValue" />
+                  <el-form-item label="项目类别：" prop="projectCategory">
+                    <el-select v-model="addParam.projectCategory" style="width: 175px" class="form-content-width" placeholder="请选择项目类别">
+                      <el-option v-for="(item, index) in projectCategory" :key="index" :label="item.dictLabel" :value="item.dictValue" />
                     </el-select>
                   </el-form-item>
                 </div>
@@ -86,9 +86,9 @@
 
               <div class="erow">
                 <div class="elcol">
-                  <el-form-item label="项目类别：" prop="projectCategory">
-                    <el-select v-model="addParam.projectCategory" style="width: 175px" class="form-content-width" placeholder="请选择项目类别">
-                      <el-option v-for="(item, index) in projectCategory" :key="index" :label="item.dictLabel" :value="item.dictValue" />
+                  <el-form-item label="项目状态：" prop="status">
+                    <el-select v-model="addParam.status" style="width: 175px" class="form-content-width" placeholder="请选择项目状态">
+                      <el-option v-for="(item, index) in status" :key="index" :label="item.dictLabel" :value="item.dictValue" />
                     </el-select>
                   </el-form-item>
                 </div>
@@ -188,6 +188,7 @@ export default {
         projectStage:'',
         projectCategory:'',
         investmentAmount:'',
+        status:'',
         isPrivate:0,
         customerId:'',
       },
@@ -202,6 +203,7 @@ export default {
       projectStage:[], //项目阶段
       projectType:[], //项目类型
       projectCategory:[], //项目类别
+      status:[], //项目状态
       isPrivate:[
         {
           value: 0,
@@ -342,6 +344,7 @@ export default {
               value:res.data[i].dictValue
             })
           }
+          this.status = res.data
         }
       })
     },

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

@@ -180,9 +180,6 @@ export default {
       this.currentPath.pathName = this.$route.query.path
     }
   },
-  mounted() {
-    console.log('进入了mounted')
-  },
   methods: {
     showPartPage(e){
       this.currentPath = e
@@ -219,18 +216,20 @@ export default {
     },
     // 判断客户是否关联显示修改
     association(id){
-      customerInfo(id).then(res=>{
-        if(res.code == 200){
-          if(res.data.companyId == this.companyId && res.data.userId == this.$store.state.user.userId){
-            this.customerInfo = res.data
-            this.customerId = res.data.customerId
-          }else{
-            this.currentPath.pathName = 'overview'
+      if(id) {
+        customerInfo(id).then(res => {
+          if (res.code == 200) {
+            if (res.data.companyId == this.companyId && res.data.userId == this.$store.state.user.userId) {
+              this.customerInfo = res.data
+              this.customerId = res.data.customerId
+            } else {
+              this.currentPath.pathName = 'overview'
+            }
           }
-        }
-      }).catch(err=>{
-        this.currentPath.pathName = 'overview'
-      })
+        }).catch(err => {
+          this.currentPath.pathName = 'overview'
+        })
+      }
     }
 
   }

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

@@ -179,7 +179,19 @@ export default {
     async handleClaim(){
       if(this.companyInfo.uipId){
         this.claimLoading = true
-        let param = {companyId:this.companyId, uipId:this.companyInfo.uipId, companyName:this.companyInfo.companyName}
+        let param = {
+          companyId:this.companyId,
+          uipId:this.companyInfo.uipId,
+          companyName:this.companyInfo.companyName,
+          creditLevel:this.companyInfo.bratingSubjectLevel || '',
+          legalPerson:this.companyInfo.corporatePerson || '',
+          registerCapital:this.companyInfo.regCapital || '',
+          provinceId:this.companyInfo.provinceId || '',
+          cityId:this.companyInfo.cityId || '',
+          districtId:this.companyInfo.districtCode || '',
+          registerAddress:this.companyInfo.provinceName+this.companyInfo.cityName?'-'+this.companyInfo.cityName:''+this.companyInfo.districtName?'-'+this.companyInfo.districtName:'',
+          creditCode:this.companyInfo.creditCode
+        }
         let res = await claim(param)
         this.claimLoading = false
         if(res.code==200){

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

@@ -107,6 +107,14 @@ export default {
           tz:'',
           bl:''
         },
+        {
+          name:'失信被执行人',
+          value:'',
+          category:'credit',
+          field:'dishonestExecutor',
+          tz:'',
+          bl:''
+        },
         {
           name:'行政处罚',
           value:'',

dsk-operate-ui/src/views/detail/party-a/urbanLnvestment/sameRegion.vue

@@ -98,7 +98,7 @@
       @sort-change="sortChange"
     >
       <template slot="companyName" slot-scope="scope">
-        <router-link :to="`/enterprise/${encodeStr(scope.row.companyId)}`" tag="a" class="a-link" v-if="scope.row.companyId&&scope.row.companyName " v-html="scope.row.companyName"></router-link>
+        <router-link :to="scope.row.uipId?`/enterprise/${encodeStr(scope.row.companyId)}`:`/company/${encodeStr(scope.row.companyId)}`" tag="a" class="a-link" v-if="scope.row.companyId&&scope.row.companyName " v-html="scope.row.companyName"></router-link>
         <div v-else v-html="scope.row.companyName  || '--'"></div>
       </template>
       <template slot="area" slot-scope="scope">

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

@@ -7,7 +7,7 @@
           :data="tableData"
           stripe border
           style="width: 100%"
-          :default-sort = "{prop: 'date', order: 'descending'}"
+          :default-sort = "{prop: 'role', order: 'descending'}"
         >
           <template slot="empty">
             <div class="empty">

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

@@ -17,6 +17,7 @@
         <el-table
           :data="tableData.rows"
           style="width: 100%"
+          :default-sort = "{prop: 'depth', order: 'descending'}"
         >
           <template slot="empty">
             <div class="empty">

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

@@ -325,8 +325,8 @@
       },
       deltip(item){
         let param={
-          businessId:this.id,
-          id:item.id
+          // businessId:this.id,
+          labelId:item.id
         }
         removeLabel(JSON.stringify(param)).then(res=>{
           if (res.code == 200){

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

@@ -10,20 +10,19 @@
           <div class="btn" @click="handleCurrentChange(1)">搜索</div>
         </div>
         <!--<div class="btn btn_primary h32 b2" @click="getUP"  v-if="fileDatas.total>0"><div class="img img2"></div>上传</div>-->
-        <div class="btn btn_primary h32 b2" v-if="fileDatas.total>0"><div class="img img2"></div>
-          <el-upload
-            class="upload-demo"
-            :action="action"
-            :on-change="handleFileListChange"
-            :multiple="false"
-            ref="upload"
-            :file-list="fileList"
-            accept=".word,.pdf.excel,.xlsx,.doc,.docx"
-            :headers="headers"
-            :show-file-list="false"
-            :on-success="onSuccess">
-            上传
-          </el-upload></div>
+        <el-upload
+          class="upload-demo"
+          :action="action"
+          :on-change="handleFileListChange"
+          :multiple="false"
+          ref="upload"
+          :file-list="fileList"
+          accept=".word,.pdf.excel,.xlsx,.doc,.docx"
+          :headers="headers"
+          :show-file-list="false"
+          :on-success="onSuccess">
+        <div class="btn btn_primary h32 b2" v-if="fileDatas.total>0"><div class="img img2"></div>上传</div>
+          </el-upload>
       </div>
       <div class="filepath" v-if="filename"><font @click="getall">全部</font> / <span> <img class="img" src="@/assets/images/folder.png">{{filename}}</span></div>
       <div class="uploadbox" v-if="isupload">
@@ -61,6 +60,7 @@
         <el-table
           :data="fileDatas.rows"
           style="width: 100%"
+          :default-sort = "{prop: 'creatTime', order: 'descending'}"
         >
           <template slot="empty">
             <div class="empty">
@@ -259,6 +259,7 @@
           let _this = this
           setTimeout(function() {
             _this.getList()
+            _this.$message.success('上传成功！')
             _this.isupload = false
           },3000)
 
@@ -296,7 +297,9 @@
 </script>
 
 <style lang="scss" scoped>
-
+  v-deep.el-upload:focus{
+    color: #FFFFFF !important;
+  }
   .delform{
     position: fixed; left:50%; top:50%; transform:translate(-50%,-50%)
   }

dsk-operate-ui/src/views/project/projectList/detail.vue

@@ -4,10 +4,9 @@
       <template v-if="!detailId">
         <span>项目管理</span>
         <span class="on" @click="tolist"> / 商机列表</span>
-        <span> / 项目详情</span>
       </template>
-<!--      <span class="on" v-else @click="cooperateList">合作情况</span>-->
-<!--      <span> / 项目详情</span>-->
+      <span class="on" v-else @click="cooperateList">合作情况</span>
+      <span> / 项目详情</span>
     </div>
     <div class="app-container" v-if="ProjectData">
       <el-card class="box-card noborder pad16 overflows">

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

@@ -40,6 +40,11 @@ public class BusinessAddDto {
      */
     private String projectStage;
 
+    /**
+     * 项目状态(0.储备中1.跟进中2.已合作)
+     */
+    private Integer status;
+
     /**
      * 业主单位
      */

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

+package com.dsk.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 行政区编码表(SysRegion)实体类
+ *
+ * @author makejava
+ * @since 2023-06-28 11:23:12
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("sys_region")
+public class SysRegion implements Serializable {
+    private static final long serialVersionUID = -17128129449360485L;
+    /**
+     * 行政区编码(数字型)
+     */
+    private Integer id;
+    /**
+     * 行政区名称
+     */
+    private String regionName;
+    /**
+     * 行政区名称（最新）
+     */
+    private String fullName;
+    /**
+     * 行政区简称
+     */
+    private String nameSimple;
+    /**
+     * 行政区编码(字符型)
+     */
+    private String regionCode;
+    /**
+     * 行政区等级:1:省级,2:地市,3:区县,4:乡镇,
+     */
+    private Integer regionLevel;
+    /**
+     * 父级id
+     */
+    private Integer parentId;
+    /**
+     * 行政区类型:0:其他,1:省,2:直辖市,3:特别行政区,4:自治区
+     */
+    private Integer regionType;
+    /**
+     * 权重
+     */
+    private Integer weight;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 0:开启，1:准备中，2:关闭
+     */
+    private Integer status;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private Integer updateId;
+
+
+}

dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseBussinessService.java

@@ -13,6 +13,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -27,12 +28,14 @@ public class EnterpriseBussinessService {
 
 
     public TableDataInfo clientPage(EnterpriseBussinessClientPageBody body) throws Exception {
+        if (body.isVaildCid()) return new TableDataInfo(new ArrayList<>(), 0);
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/clientPage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
 
     public Map<String, Object> clientProjectPage(EnterpriseBussinessClientProjectPageBody body) throws Exception {
+        if (body.isVaildCid()) return null;
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/clientProjectPage", BeanUtil.beanToMap(body, false, false));
         Integer code = MapUtils.getInteger(map, "code", 300);
         Map data = MapUtils.getMap(map, "data", null);
@@ -47,6 +50,7 @@ public class EnterpriseBussinessService {
 
 
     public TableDataInfo tenderPage(EnterpriseBussinessTenderPageBody body) throws Exception {
+        if (body.isVaildCid()) return new TableDataInfo(new ArrayList<>(), 0);;
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/tenderPage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
@@ -83,12 +87,14 @@ public class EnterpriseBussinessService {
 
 
     public TableDataInfo supplierPage(EnterpriseBussinessSupplierPageBody body) throws Exception {
+        if (body.isVaildCid()) return new TableDataInfo(new ArrayList<>(), 0);
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/supplierPage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
 
     public Map<String, Object> supplierProjectPage(EnterpriseBussinessSupplierProjectPageBody body) throws Exception {
+        if (body.isVaildCid()) return null;
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/supplierProjectPage", BeanUtil.beanToMap(body, false, false));
         log.info(JSONUtil.toJsonStr(map));
         Integer code = MapUtils.getInteger(map, "code", 300);
@@ -110,24 +116,28 @@ public class EnterpriseBussinessService {
 
 
     public TableDataInfo oftenAgencyPage(EnterpriseBussinessOftenAgencyPageBody body) throws Exception {
+        if (body.isVaildCid()) return new TableDataInfo(new ArrayList<>(), 0);
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/oftenAgencyPage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
 
     public TableDataInfo bidCooperatePage(EnterpriseBussinessBidCooperatePageBody body) throws Exception {
+        if (body.isVaildCid()) return new TableDataInfo(new ArrayList<>(), 0);
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/bidCooperatePage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
 
     public TableDataInfo historySendPage(EnterpriseBussinessHistorySendPageBody body) throws Exception {
+        if (body.isVaildCid()) return new TableDataInfo(new ArrayList<>(), 0);
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/historySendPage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
 
     public R historySendProvince(EnterpriseBussinessHistorySendProvinceBody body) throws Exception {
+        if (body.isVaildCid()) return R.ok();
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/historySendProvince", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
     }

dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseCreditService.java

@@ -13,6 +13,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -28,96 +29,112 @@ public class EnterpriseCreditService {
 
 
     public TableDataInfo penalizePage(EnterpriseCreditPenalizePageBody body) throws Exception {
+        if (body.isVaildCid()) return new TableDataInfo(new ArrayList<>(), 0);
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseCredit/penalizePage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
 
     public R penalizeReasonType(EnterpriseCreditPenalizeReasonTypeBody body) throws Exception {
+        if (body.isVaildCid()) return R.ok();
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseCredit/penalizeReasonType", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
     }
 
 
     public TableDataInfo abnormalPage(EnterpriseCreditAbnormalPageBody body) throws Exception {
+        if (body.isVaildCid()) return new TableDataInfo(new ArrayList<>(), 0);
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseCredit/abnormalPage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
 
     public R abnormalYears(EnterpriseCreditAbnormalYearsBody body) throws Exception {
+        if (body.isVaildCid()) return R.ok();
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseCredit/abnormalYears", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
     }
 
 
     public TableDataInfo executedPersonsPage(EnterpriseCreditExecutedPersonsPageBody body) throws Exception {
+        if (body.isVaildCid()) return new TableDataInfo(new ArrayList<>(), 0);
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseCredit/executedPersonsPage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
 
     public TableDataInfo executedPage(EnterpriseCreditExecutedPageBody body) throws Exception {
+        if (body.isVaildCid()) return new TableDataInfo(new ArrayList<>(), 0);
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseCredit/executedPage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
 
     public TableDataInfo lawsuitsPage(EnterpriseCreditLawsuitsPageBody body) throws Exception {
+        if (body.isVaildCid()) return new TableDataInfo(new ArrayList<>(), 0);
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseCredit/lawsuitsPage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
 
     public R lawsuitsCauseAction(EnterpriseCreditLawsuitsCauseActionBody body) throws Exception {
+        if (body.isVaildCid()) return R.ok();
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseCredit/lawsuitsCauseAction", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
     }
 
 
     public R lawsuitsRole(EnterpriseCreditLawsuitsRoleBody body) throws Exception {
+        if (body.isVaildCid()) return R.ok();
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseCredit/lawsuitsRole", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
     }
 
 
     public TableDataInfo noticesPage(EnterpriseCreditNoticePageBody body) throws Exception {
+        if (body.isVaildCid()) return new TableDataInfo(new ArrayList<>(), 0);
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseCredit/noticesPage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
 
     public R noticesType(EnterpriseCreditNoticeTypeBody body) throws Exception {
+        if (body.isVaildCid()) return R.ok();
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseCredit/noticesType", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
     }
 
 
     public R noticesRole(EnterpriseCreditNoticeRoleBody body) throws Exception {
+        if (body.isVaildCid()) return R.ok();
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseCredit/noticesRole", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
     }
 
 
     public R noticesCaseReason(EnterpriseCreditNoticeCaseReasonBody body) throws Exception {
+        if (body.isVaildCid()) return R.ok();
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseCredit/noticesCaseReason", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
     }
 
 
     public TableDataInfo kaitingPage(EnterpriseCreditKaitingPageBody body) throws Exception {
+        if (body.isVaildCid()) return new TableDataInfo(new ArrayList<>(), 0);
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseCredit/kaitingPage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
 
     public R kaitingCauseAction(EnterpriseCreditKaitingCauseActionBody body) throws Exception {
+        if (body.isVaildCid()) return R.ok();
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseCredit/kaitingCauseAction", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
     }
 
 
     public R kaitingPureRole(EnterpriseCreditKaitingPureRoleBody body) throws Exception {
+        if (body.isVaildCid()) return R.ok();
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseCredit/kaitingPureRole", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
     }

dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseProjectService.java

@@ -13,6 +13,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -26,12 +27,14 @@ public class EnterpriseProjectService {
 
 
     public TableDataInfo landTransactionPage(EnterpriseProjectLandTransactionPageBody body) throws Exception {
+        if (body.isVaildCid()) return new TableDataInfo(new ArrayList<>(), 0);
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/landTransactionPage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
 
     public R landUse(EnterpriseProjectLandUseBody body) throws Exception {
+        if (body.isVaildCid()) return R.ok();
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/landUse", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
     }
@@ -44,6 +47,7 @@ public class EnterpriseProjectService {
 
 
     public TableDataInfo approvalProjectPage(EnterpriseProjectApprovalProjectPageBody body) throws Exception {
+        if (body.isVaildCid()) return new TableDataInfo(new ArrayList<>(), 0);
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/approvalProjectPage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
@@ -68,6 +72,7 @@ public class EnterpriseProjectService {
 
 
     public TableDataInfo specialDebtProjectPage(EnterpriseProjectSpecialDebtProjectPageBody body) throws Exception {
+        if (body.isVaildCid()) return new TableDataInfo(new ArrayList<>(), 0);
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/specialDebtProjectPage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
@@ -84,18 +89,21 @@ public class EnterpriseProjectService {
     }
 
     public TableDataInfo bidNoticePage(EnterpriseProjectBidNoticePageBody body) throws Exception {
+        if (body.isVaildCid()) return new TableDataInfo(new ArrayList<>(), 0);
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/bidNoticePage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
 
     public R bidNoticeTenderStage(EnterpriseProjectBidNoticeTenderStageBody body) throws Exception {
+        if (body.isVaildCid()) return R.ok();
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/bidNoticeTenderStage", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
     }
 
 
     public R bidNoticeArea(EnterpriseProjectBidNoticeAreaBody body) throws Exception {
+        if (body.isVaildCid()) return R.ok();
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/bidNoticeArea", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
     }
@@ -108,6 +116,7 @@ public class EnterpriseProjectService {
 
 
     public TableDataInfo bidPlanPage(EnterpriseProjectBidPlanPageBody body) throws Exception {
+        if (body.isVaildCid()) return new TableDataInfo(new ArrayList<>(), 0);
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/bidPlanPage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
@@ -144,21 +153,25 @@ public class EnterpriseProjectService {
 
 
     public TableDataInfo bidNoticeProPage(EnterpriseProjectBidNoticeProPageBody body) throws Exception {
+        if (body.isVaildCid()) return new TableDataInfo(new ArrayList<>(), 0);
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/bidNoticeProPage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
     public R bidNoticeProProjectType(EnterpriseProjectBidNoticeProProjectTypeBody body) throws Exception {
+        if (body.isVaildCid()) return R.ok();
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/bidNoticeProProjectType", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
     }
 
     public R bidNoticeProProjectPurposes(EnterpriseProjectBidNoticeProProjectPurposesBody body) throws Exception {
+        if (body.isVaildCid()) return R.ok();
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/bidNoticeProProjectPurposes", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
     }
 
     public R bidNoticeProAssessmentWay(EnterpriseProjectBidNoticeProAssessmentWayBody body) throws Exception {
+        if (body.isVaildCid()) return R.ok();
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/bidNoticeProAssessmentWay", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
     }
@@ -171,6 +184,7 @@ public class EnterpriseProjectService {
 
 
     public TableDataInfo creditXzxkPage(EnterpriseProjectCreditXzxkPageBody body) throws Exception {
+        if (body.isVaildCid()) return new TableDataInfo(new ArrayList<>(), 0);
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/creditXzxkPage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }

dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseService.java

@@ -49,12 +49,15 @@ public class EnterpriseService {
     private RedisCache redisCache;
 
     public R infoHeader(EnterpriseInfoHeaderBody body) throws Exception {
+        if (body.isVaildCid()) return R.ok();
         Map<String, Object> companyMap = dskOpenApiUtil.requestBody("/api/jsk/enterprise/infoHeader", BeanUtil.beanToMap(body, false, false));
         Integer companyCode = MapUtils.getInteger(companyMap, "code", 300);
         if (200 != companyCode) return R.ok();
+
         Map companyData = MapUtils.getMap(companyMap, "data", null);
-        companyData.put("claimStatus", 0);
         companyData.put("uipId", null);
+        companyData.put("claimStatus", 0);
+        companyData.put("bratingSubjectLevel", null);
 
         Map<String, Object> map = BeanUtil.beanToMap(body, false, false);
         map.put("cid", body.getCompanyId());
@@ -65,24 +68,27 @@ public class EnterpriseService {
 
         Map uipData = MapUtils.getMap(uipMap, "data", new HashMap<>());
         String uipId = MapUtils.getString(uipData, "uipId", null);
-
-        if (ObjectUtil.isEmpty(uipId)) {
-            return R.ok(companyData);
+        companyData.put("uipId", uipId);
+        if (!ObjectUtil.isEmpty(uipId)) {
+            ArrayList<String> uipIds = new ArrayList<>();
+            uipIds.add(uipId);
+            companyData.put("claimStatus", CollectionUtils.isEmpty(iCustomerService.selectStatusList(uipIds)) ? 0 : 1);
         }
 
-        companyData.put("uipId", uipId);
-        ArrayList<String> uipIds = new ArrayList<>();
-        uipIds.add(uipId);
-        List<CustomerStatusListVo> claimStatusList = iCustomerService.selectStatusList(uipIds);
+        Map<String, Object> bondCreditRatingMap = dskOpenApiUtil.requestBody("/operate/enterprise/bondCreditRating", map);
+        Integer bondCreditRatingCode = MapUtils.getInteger(bondCreditRatingMap, "code", 300);
+        if (200 != bondCreditRatingCode) return R.ok(companyData);
 
-        if (CollectionUtils.isNotEmpty(claimStatusList)) {
-            companyData.put("claimStatus", 1);
-        }
+        List<Map<String, Object>> bondCreditRatingList = (List<Map<String, Object>>)MapUtils.getObject(bondCreditRatingMap, "data", new ArrayList<>());
+        if (CollectionUtils.isEmpty(bondCreditRatingList)) return R.ok(companyData);
+
+        companyData.put("bratingSubjectLevel", MapUtils.getString(bondCreditRatingList.get(0), "bratingSubjectLevel", null));
 
         return R.ok(companyData);
     }
 
     public R statistic(EnterpriseStatisticBody body) throws Exception {
+        if (body.isVaildCid()) return R.ok();
         Map<String, Object> statisticMap = dskOpenApiUtil.requestBody("/api/jsk/enterprise/statistic", BeanUtil.beanToMap(body, false, false));
 
         Integer statisticMapCode = MapUtils.getInteger(statisticMap, "code", 300);
@@ -113,58 +119,68 @@ public class EnterpriseService {
     }
 
     public R bidDataGroup(EnterpriseBidDataGroupBody body) throws Exception {
-
+        if (body.isVaildCid()) return R.ok();
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/bidDataGroup", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
     }
 
     public R projectTenderDataGroup(EnterpriseProjectTenderDataGroupBody body) throws Exception {
+        if (body.isVaildCid()) return R.ok();
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/projectTenderDataGroup", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
     }
 
     //todo 新数据，待入库
     public TableDataInfo partners(EnterprisePartnersBody body) throws Exception {
+        if (body.isVaildCid()) return new TableDataInfo(new ArrayList<>(), 0);
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/partners", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
     public TableDataInfo investment(EnterpriseInvestmentBody body) throws Exception {
+        if (body.isVaildCid()) return new TableDataInfo(new ArrayList<>(), 0);
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/investment", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
     public TableDataInfo affiliates(EnterpriseAffiliatesBody body) throws Exception {
+        if (body.isVaildCid()) return new TableDataInfo(new ArrayList<>(), 0);
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/affiliates", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
     public TableDataInfo dynamicPage(EnterpriseDynamicPageBody body) throws Exception {
+        if (body.isVaildCid()) return new TableDataInfo(new ArrayList<>(), 0);
         Map<String, Object> map = dskOpenApiUtil.requestBody("/api/jsk/enterprise/dynamic", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
     public R icInfo(EnterpriseIcInfoBody body) throws Exception {
+        if (body.isVaildCid()) return R.ok();
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/icInfo", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
     }
 
     public TableDataInfo changeInfo(EnterpriseChangeInfoBody body) throws Exception {
+        if (body.isVaildCid()) return new TableDataInfo(new ArrayList<>(), 0);
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/changeInfo", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
     public TableDataInfo keymembers(EnterpriseKeymembersBody body) throws Exception {
+        if (body.isVaildCid()) return new TableDataInfo(new ArrayList<>(), 0);
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/keymembers", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
     public TableDataInfo bestStockPage(EnterpriseBestStockPageBody body) throws Exception {
+        if (body.isVaildCid()) return new TableDataInfo(new ArrayList<>(), 0);
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/bestStockPage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
     public R financial(EnterpriseFinancialBody body) throws Exception {
+        if (body.isVaildCid()) return R.ok();
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/financial", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
     }
@@ -234,6 +250,7 @@ public class EnterpriseService {
     }
 
     public R bondCreditRating(EnterpriseBondCreditRatingBody body) throws Exception {
+        if (body.isVaildCid()) return R.ok();
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/bondCreditRating", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
     }

dsk-system/src/main/java/com/dsk/system/mapper/SysRegionMapper.java

+package com.dsk.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsk.system.domain.SysRegion;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+
+/**
+ * 行政区编码表(SysRegion)表数据库访问层
+ *
+ * @author makejava
+ * @since 2023-06-28 11:23:13
+ */
+@Mapper
+public interface SysRegionMapper extends BaseMapper<SysRegion> {
+
+}
+

dsk-system/src/main/java/com/dsk/system/service/SysRegionService.java

+package com.dsk.system.service;
+
+import com.dsk.system.domain.SysRegion;
+
+import java.util.List;
+
+/**
+ * 行政区编码表(SysRegion)表服务接口
+ *
+ * @author makejava
+ * @since 2023-06-28 11:23:12
+ */
+public interface SysRegionService {
+
+    List<SysRegion> selectByParentId(Integer parentId);
+
+}

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

@@ -106,9 +106,8 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
         //商务团队
         businessBrowseVo.setTeam(businessUserMapper.selectCreatorByBusinessId(businessId));
         //查询是否是项目创建人
-//        Long userId = SecurityUtils.getLoginUser().getUserId();
-//        if (userId == null) throw new BaseException("请登录");
-        Long userId = 103l;
+        Long userId = SecurityUtils.getLoginUser().getUserId();
+        if (userId == null) throw new BaseException("请登录");
         Integer founder = businessUserMapper.selectFounder(businessId, userId);
         businessBrowseVo.setIsFounder(founder == null ? 0 : founder);
         //查询项目标签
@@ -135,7 +134,6 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
     public AjaxResult batchUpload(MultipartFile file) {
         //获取当前登录用户id
         Long userId = SecurityUtils.getLoginUser().getUserId();
-//        Long userId = 103L;
         if (userId == null) return AjaxResult.error("请登录");
         int row = 3;//起始行数
         int rowSuccess = 0;//成功条数
@@ -196,7 +194,6 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
         if (addBusiness > 0) {
             //获取登陆用户的部门id
             Long deptId = SecurityUtils.getLoginUser().getDeptId();
-//            Long deptId = 100l;
             //新增用户-项目关系信息
             int addbusinessUser = businessUserMapper.insertBusinessUser(new BusinessUser(businessInfo.getId(), deptId.intValue(), dto.getUserId(), 1));
             return addbusinessUser > 0 ? AjaxResult.success() : AjaxResult.error();

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

+package com.dsk.system.service.impl;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.dsk.system.domain.SysRegion;
+import com.dsk.system.mapper.SysRegionMapper;
+import com.dsk.system.service.SysRegionService;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 行政区编码表(SysRegion)表服务实现类
+ *
+ * @author makejava
+ * @since 2023-06-28 11:23:12
+ */
+@Service("sysRegionService")
+public class SysRegionServiceImpl implements SysRegionService {
+    @Resource
+    private SysRegionMapper baseMapper;
+
+    private static final Integer ACQUIESCE_PARENT_ID = 100000;
+
+    @Override
+    public List<SysRegion> selectByParentId(Integer parentId) {
+        return baseMapper.selectList(Wrappers.<SysRegion>lambdaQuery()
+                .eq(SysRegion::getParentId, ObjectUtils.isEmpty(parentId) ? ACQUIESCE_PARENT_ID : parentId)
+                .orderByAsc(SysRegion::getId));
+    }
+}

dsk-system/src/main/resources/mapper/system/SysRegionMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dsk.system.mapper.SysRegionMapper">
+
+</mapper>
+