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

dsk-admin/src/main/resources/application-dev.yml

@@ -157,7 +157,7 @@ token:
     # 令牌密钥
     secret: abcdefghijklmnopqrstuvwxyz
     # 令牌有效期（默认30分钟）
-    expireTime: 30
+    expireTime: 240
 
 
 #mybatis:

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

@@ -13,7 +13,7 @@ import javax.validation.constraints.NotNull;
 @EqualsAndHashCode(callSuper = false)
 public class EnterpriseProjectLandDetailBody {
     /**
-     * 企业id
+     * id
      */
     @NotNull(message = "id不能为空")
     private Integer id;

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

@@ -17,7 +17,7 @@ public class EnterpriseUipSearchBody extends BasePage {
     /**
      * 查询关键字
      */
-    private String keys;
+    private List<String> keys;
 
 
     /*

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

@@ -41,4 +41,9 @@ public class SpecialPurposeBondsDto {
      * 排序 (降序desc 升序asc)
      */
     private String order;
+    /**
+     * 是否为历史（1是，0否）
+     */
+    private Integer isHistory;
+
 }

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

@@ -5,7 +5,7 @@ import lombok.Data;
 
 /**
  * @ClassName SpecialPurposeBonds
- * @Description 专项债-项目类别统计
+ * @Description 专项债-项目分页列表
  * @Author Dgm
  * @Date 2023/5/23 14:05
  * @Version
@@ -16,4 +16,18 @@ public class SpecialPurposeBondsPageDto extends BasePage {
      * 省Id
      */
     private Integer provinceId;
+
+    /**
+     * 排序字段 默认-投资金额
+     */
+    private String field;
+    /**
+     * 排序 (降序desc 升序asc)
+     */
+    private String order;
+    /**
+     * 是否为历史（1是，0否）
+     */
+    private Integer isHistory;
+
 }

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

@@ -28,7 +28,7 @@
   width: 200px;
   height: 114px;
   background: #FFFFFF;
-  box-shadow: 0px 0px 8px 0px rgba(0,0,0,0.1608);
+  box-shadow: 0px 0px 8px 0px rgba(0,0,0,0.12);
   border-radius: 2px;
   position: absolute;
   z-index: 3;
@@ -279,12 +279,15 @@
 //表格样式
 .tables{
   padding:  0 16px 24px;
-  .el-table .el-table__header-wrapper th{
+  .el-table .el-table__header-wrapper th,.el-table th.el-table__cell.is-leaf{
     color: #4f4f4f;
     background: #F0F3FA;
     font-size: 12px;
     font-weight: 400;
   }
+  .el-table__fixed::before{
+    background: none;
+  }
   .is-sortable .sort-caret.ascending{
     border-bottom-color: #0081FF;
     opacity: 0.4;
@@ -315,6 +318,9 @@
   .el-table th.el-table__cell.is-leaf{
     border-bottom: 0;
   }
+  .el-table__body tr.hover-row > td.el-table__cell,.el-table__body tr.el-table__row--striped.hover-row > td.el-table__cell{
+    background: #DCEBFF;
+  }
   .has-gutter{
     th{
       height: 40px;
@@ -339,7 +345,7 @@
       font-weight: 400;
       color: #333333;
       line-height: 21px;
-      margin-bottom: 4px;
+      margin-bottom: 8px;
     }
     .p2{
       height: 18px;
@@ -1130,3 +1136,30 @@
   padding-top: 14px;
   padding-bottom: 18px;
 }
+
+.tables{
+  ::-webkit-scrollbar-track-piece {
+    //滚动条凹槽的颜色，还可以设置边框属性
+    background-color: #F3F4F5;
+    height: 16px;
+    padding: 0 4px;
+  }
+  //滚动条的宽度
+  ::-webkit-scrollbar {
+    width: 8px;
+    height: 16px;
+    background-color: #F3F4F5;
+    border-radius: 6px;
+  }
+  //滚动条的滑块
+  ::-webkit-scrollbar-thumb {
+    border-radius: 8px;
+    height: 8px;
+    margin: 0 4px;
+    background: rgba(98,110,126,0.2);
+    border: 4px solid #F3F4F5;
+    &:hover{
+      background: #566380;
+    }
+  }
+}

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

@@ -34,6 +34,7 @@
             <el-table-column
               prop="index"
               label="序号"
+              fixed="left"
               width="47">
               <template slot-scope='scope'>
                 <span>{{ (searchParam.pageNum - 1) * searchParam.pageSize + scope.$index + 1 }}</span>
@@ -42,6 +43,7 @@
             <el-table-column
               prop="date"
               label="企业名称"
+              fixed="left"
               width="441">
             <template slot-scope="scope">
               <div class="ps1">
@@ -515,7 +517,7 @@ export default {
       transform: translate(-50%,-50%);
       .btn{
         margin-right: 8px;
-        margin-top: 12px;
+        margin-top: 16px;
       }
     }
   }

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

@@ -54,12 +54,12 @@
                 label="名称">
               </el-table-column>
               <el-table-column
-                prop="name"
-                label="数量（家）">
+                prop="sum"
+                label="数量（家）" align="right">
               </el-table-column>
               <el-table-column
                 prop="point"
-                label="占比">
+                label="占比" align="right">
               </el-table-column>
             </el-table>
           </div>
@@ -333,6 +333,12 @@ export default {
           axisTick: {
             show: false
           },
+          boundaryGap: false,
+          nameLocation:'end',
+          nameTextStyle: {
+            fontSize:12,
+            padding: [0, 0, 0, -30]
+          },
         },
         yAxis: {
           type: 'value',

dsk-operate-ui/src/views/enterpriseData/components/Owner/index.vue

@@ -168,7 +168,6 @@
 	  			 </el-table-column>
 	  			<el-table-column label="区域"   width="120">
 	  					<template slot-scope="scope">
-							<router-link  :to="'/radar/bxprozbgg/details/'+ 1" tag="a" class="list-titel-a"  >
 							   {{scope.row.province}}
 							   <template v-if="scope.row.city">
 							   	-
@@ -178,8 +177,6 @@
 							   	-
 							   </template>
 							   {{scope.row.area}}
-							</router-link>
-							
 	  					</template>
 	  						  
 	  			</el-table-column>
@@ -591,7 +588,7 @@ export default {
   },
   mounted() {
    
-    this.addressListfn();
+    this.init();
   },
   methods: {
     domicileChange() {
@@ -675,7 +672,7 @@ export default {
    
     },
     init(){
-      // this.search();
+      this.search();
       this.addressListfn();
     },
    

dsk-operate-ui/src/views/enterpriseData/components/SearchEnterprise/index.vue

@@ -2764,11 +2764,11 @@
       },
 			
 			toEnterprise(id, html,type) {
-				return '/enterprise/' + encodeStr(id) + html + '/'+(type?'?flag=true&type='+type:'');
+				return '/company/' + encodeStr(id) + html + '/'+(type?'?flag=true&type='+type:'');
 			},
 			
 			toEnterpriseDetail(id) {
-				return '/enterprise/' + encodeStr(id)  + '/?index=true';
+				return '/company/' + encodeStr(id)  + '/?index=true';
 			},
 			
 			labelsWidth(e,t=0){

dsk-operate-ui/src/views/project/overview/index.vue

@@ -317,6 +317,7 @@ export default {
       //客户跟进动态
       this.option = {
         xAxis: {
+          boundaryGap: false,
           type: 'category',
           data: labels,
           axisTick: {
@@ -334,7 +335,7 @@ export default {
         },
         grid:{
           left:'4%',
-          top:'20%',
+          top:'21%',
           right:'2%',
           bottom:'15%',
         },
@@ -345,8 +346,8 @@ export default {
           // trigger: 'axis'
         },
         legend: {
-          left: '12px',
-          top:"15px",
+          right: '20px',
+          top:"30px",
           data: ['成交金额', '储备项目', '跟进动态'],
           itemHeight: 8, // 修改icon图形大小
           itemGap: 20

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

@@ -122,7 +122,14 @@
       onSuccess(res, file, fileList) {
         if (res.code == 200) {
           this.successCount = res.successCount
+
+          if(this.importtype == 'project'){//项目管理
             this.messages = res.msg
+          }
+          if(this.importtype == 'custom'){//客户管理
+            let str = '成功导入客户条数'+res.successCount+',客户去重条数'+res.data?res.data.length:0
+            this.messages = str
+          }
           this.addsuccess = true
         }else {
           this.importCancel()

dsk-operate-ui/src/views/radar/BidRecord/details.vue

@@ -56,7 +56,7 @@
 			  
 		      <el-table-column  label="项目名称" >
 				  <template slot-scope="scope">
-				    {{ scope.row.name||'--'}}
+					  <router-link v-if="scope.row.companyId" :to="'/company/' + encodeStr(scope.row.companyId)  + '/?index=true'" tag="a" class="list-titel-a blue" v-html="scope.row.name"></router-link>
 				  </template>
 			  </el-table-column>
 			  
@@ -100,14 +100,14 @@
 
 <script>
 	import "@/assets/styles/public.css";
-	import {
-		encodeStr
-	} from "@/assets/js/common.js"
+	import {encodeStr} from "@/assets/js/common.js"
+	
 	import api from '@/api/radar/radar.js';
 	export default {
 		name: 'BidRecordDetails',
 		data() {
 			return {
+				encodeStr,
 				id: '',
 				tableData: [],
 				"pageNum": 1,

dsk-operate-ui/src/views/radar/Land/details.vue

@@ -10,7 +10,8 @@
 					<div class="list-content">
 						<p class="list-content-text">
 							<span>受让人：</span>
-							<span class="blue">{{textList.company||"--"}}</span>
+							<router-link v-if="textList.company" :to="'/company/' + encodeStr(textList.id)  + '/?index=true'" tag="a" class="list-titel-a blue" v-html="textList.company"></router-link>
+							<span v-else class="blue">{{textList.company||"--"}}</span>
 						</p>
 						<p class="list-content-text">
 							<span>成交金额：</span>
@@ -192,12 +193,14 @@
 
 <script>
 	import api from '@/api/radar/radar.js';
+	import {encodeStr} from "@/assets/js/common.js"
 	export default {
 
 		name: 'LandDetails',
 		data() {
 			return {
 				id: '',
+				encodeStr,
 				textList: {}
 
 			}

dsk-operate-ui/src/views/radar/Tender/details.vue

@@ -25,13 +25,17 @@
 					</div>
 					
 					<div  class="list-content">
-						<p class="list-content-text">
+						<p class="list-content-text" v-if="textList.tenderee">
 							<span>招采单位：</span>
-							<span class="blue">	{{textList.tenderee||'--'}}</span>
+							<router-link v-if="textList.projectUnitId" :to="'/company/' + encodeStr(textList.projectUnitId)  + '/?index=true'" tag="a" class="list-titel-a blue" v-html="textList.tenderee"></router-link>
+							<span v-else class="blue">	{{textList.tenderee||'--'}}</span>
 						</p>
-						<p class="list-content-text">
+						<p class="list-content-text"  v-if="textList.agency">
 							<span>代理单位：</span>
 							<span class="blue">{{textList.agency||'--'}}</span>
+							<router-link v-if="textList.agencyId" :to="'/company/' + encodeStr(textList.agencyId)  + '/?index=true'" tag="a" class="list-titel-a blue" v-html="textList.agency"></router-link>
+							<span v-else class="blue">	{{textList.agency||'--'}}</span>
+							
 						</p>
 						
 					</div>
@@ -89,11 +93,13 @@
 <script>
 	import "@/assets/styles/public.css";
 	import api from '@/api/radar/radar.js';
+	import {encodeStr} from "@/assets/js/common.js"
 	export default {
 
 		name: 'TenderDetails',
 		data() {
 			return {
+				encodeStr,
 				id: '',
 				textList:{},
 				showimg:true

dsk-operate-ui/src/views/radar/bxprozbgg/details.vue

@@ -173,10 +173,13 @@
 			<div class="main3-box">
 				<p>
 					<label class="label">招标人</label>
-					<span class="color2">{{textList.tenderee||'--'}}</span>
+					<router-link v-if="textList.tendereeId" :to="'/company/' + encodeStr(textList.tendereeId)  + '/?index=true'" tag="a" class="list-titel-a color2" v-html="textList.tenderee"></router-link>
+					<span v-else class="color2">{{textList.tenderee||'--'}}</span>
 					<label class="label">代理机构</label>
-					<span class="color2">{{textList.agency||'--'}}</span>
+					<router-link v-if="textList.agencyId" :to="'/company/' + encodeStr(textList.agencyId)  + '/?index=true'" tag="a" class="list-titel-a color2" v-html="textList.agency"></router-link>
+					<span v-else class="color2">{{textList.agency||'--'}}</span>
 				</p>
+				
 				<p>
 					<label class="label">招标人联系方式</label>
 					<span>{{textList.tendereeTel||'--'}}</span>
@@ -199,11 +202,13 @@
 <script>
 	import "@/assets/styles/public.css";
 	import api from '@/api/radar/radar.js';
+	import {encodeStr} from "@/assets/js/common.js"
 	export default {
 
 		name: 'bxprozbggDetails',
 		data() {
 			return {
+				encodeStr,
 				id: '',
 				textList: {},
 				showimg:true,
@@ -512,6 +517,11 @@
 					.color2{
 						color: #0081FF;
 						cursor: pointer;
+						display: flex;
+						align-items: center;
+						width: 40%;
+						padding: 12px;
+						font-size: 12px;
 					}
 
 				}

dsk-operate-ui/src/views/radar/components/Bidding/index.vue

@@ -164,7 +164,8 @@
 	  			<div  class="list-content">
 	  				<p class="list-content-text">
 	  					<span>招采单位：</span>
-	  					<span class="blue">{{item.tenderee||'--'}}</span>
+						<router-link v-if="item.tendereeId" :to="'/company/' + encodeStr(item.tendereeId)  + '/?index=true'" tag="a" class="list-titel-a blue" v-html="item.tenderee"></router-link>
+						<span v-else>{{item.tenderee||'--'}}</span>
 	  				</p>
 	  				<p class="list-content-text">
 	  					<span>合同预估金额（万元）：</span>

dsk-operate-ui/src/views/radar/components/Land/index.vue

@@ -234,7 +234,7 @@
 						<div  class="list-content">
 							<p class="list-content-text">
 								<span>受让人：</span>
-								<span class="blue">{{item.companyName||'--'}}</span>
+								<router-link :to="'/company/' + encodeStr(item.id)  + '/?index=true'" tag="a" class="list-titel-a blue" v-html="item.companyName"></router-link>
 							</p>
 							<p class="list-content-text">
 								<span>成交金额：</span>
@@ -1127,7 +1127,7 @@
 		}
 		.bottomlist-list:hover{
 			background: #F6F9FC;
-			cursor: pointer;
+			
 		}
 		.pagination{
 			padding: 14px ;

dsk-operate-ui/src/views/radar/components/Tender/index.vue

@@ -207,11 +207,13 @@
 					<div  class="list-content"  v-if="item.companyName||item.agency">
 						<p class="list-content-text" v-if="item.companyName">
 							<span>招采单位：</span>
-							<span class="blue">{{item.companyName||'--'}}</span>
+							<router-link v-if="item.jskEid" :to="'/company/' + encodeStr(item.jskEid)  + '/?index=true'" tag="a" class="list-titel-a blue" v-html="item.companyName"></router-link>
+						    <span v-else class="blue">{{item.companyName||'--'}}</span>
 						</p>
 						<p class="list-content-text" v-if="item.agency">
 							<span>代理单位：</span>
-							<span class="blue">{{item.agency||'--'}}</span>
+							<router-link v-if="item.agencyId" :to="'/company/' + encodeStr(item.agencyId)  + '/?index=true'" tag="a" class="list-titel-a blue" v-html="item.agency"></router-link>
+							<span v-else class="blue">{{item.agency||'--'}}</span>
 						</p>
 						
 					</div>
@@ -275,6 +277,7 @@
 		data() {
 			return {
 				//有无联系方式
+				encodeStr,
 				phonePointType: [{
 						value: '',
 						label: '不限'

dsk-operate-ui/src/views/radar/components/debtProject/index.vue

@@ -103,20 +103,20 @@
 						 <router-link :to="'/radar/debtProject/details/'+item.uuid " tag="a" class="list-titel-a" v-html="item.projectName"></router-link>
 					</p>
 					
-					<div class="content-label">
+					<div class="content-label" v-if="item.domicile">
 						<span class="list-label">{{item.domicile}}</span>
 					</div>
 					
 					<div  class="list-content">
-						<p class="list-content-text">
+						<p class="list-content-text" v-if="item.projectType">
 							<span>项目类型：</span>
 							<span>{{item.projectType}}</span>
 						</p>
-						<p class="list-content-text">
+						<p class="list-content-text"v-if="item.projectTotalInvestment">
 							<span>项目总投资(亿)：</span>
 							<span>{{item.projectTotalInvestment}}</span>
 						</p>
-						<p class="list-content-text">
+						<p class="list-content-text" v-if="item.specialCapital">
 							<span>项目资本金(亿)：</span>
 							<span>{{item.projectCapital}}</span>
 						</p>
@@ -126,17 +126,17 @@
 						</p>
 					</div>
 					<div  class="list-content">
-						<p class="list-content-text">
+						<p class="list-content-text" v-if="item.specialCapital">
 							<span>项目主体：</span>
-							<span class="blue">{{item.projectEntity}}</span>
+							<span >{{item.projectEntity}}</span>
 						</p>
-						<p class="list-content-text">
+						<p class="list-content-text" v-if="item.chargeDepartment">
 							<span>主管部门：</span>
-							<span class="blue">{{item.chargeDepartment}}</span>
+							<span >{{item.chargeDepartment}}</span>
 						</p>
-						<p class="list-content-text">
+						<p class="list-content-text"  v-if="item.piu">
 							<span>实施单位：</span>
-							<span class="blue">{{item.piu}}</span>
+							<span >{{item.piu}}</span>
 						</p>
 					</div>
 				</li>

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

@@ -43,7 +43,7 @@
 	
 	import "@/assets/styles/public.css";
 	export default {
-		name: 'radar',
+		name: 'Radar',
 		components: { debtProject,Land,Establishment,bxprozbgg,Tender,BidRecord,Bidding },
 		data() {
 			return {
@@ -95,7 +95,9 @@
 				personnelHerf:'debtProject'
 			}
 		},
-		created() {},
+		created() {
+			// console.log(this.$route.name)
+		},
 		methods: {
 			personnelListbtn(index) {
 				for (var i = 0; i < this.personnelList.length; i++) {

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

@@ -22,9 +22,9 @@ public class BusinessListDto {
     private Integer userId;
 
     /**
-     * 部门id
+     * 用户查看全部他人可见项目标示
      */
-    private Integer deptId;
+    private Integer others;
 
     /**
      * 省id

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

 package com.dsk.system.dskService;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONUtil;
 import com.dsk.common.core.domain.R;
 import com.dsk.common.core.domain.model.*;
@@ -12,6 +13,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -52,6 +54,30 @@ public class EnterpriseBussinessService {
 
     public R tenderDetail(EnterpriseBussinessTenderDetailBody body) throws Exception {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/tenderDetail", BeanUtil.beanToMap(body, false, false));
+        Map data = MapUtils.getMap(map, "data", null);
+        String mongoContentId = MapUtils.getString(data, "mongoContentId");
+        if (ObjectUtil.isEmpty(mongoContentId)) {
+            return BeanUtil.toBean(map, R.class);
+        }
+
+        HashMap<String, Object> contentParam = new HashMap<>();
+        contentParam.put("data_type", "kaibiao");
+        contentParam.put("filter_type", 2);
+        contentParam.put("strategy_id", mongoContentId);
+        Map<String, Object> contentMap = dskOpenApiUtil.requestBody("/mongocontent/v1/cjb/mongo_content", contentParam);
+
+        Map contentData = MapUtils.getMap(contentMap, "data", null);
+        log.info("contentData:{}", JSONUtil.toJsonStr(contentData));
+
+        if (200 != MapUtils.getInteger(contentMap, "code", 300)) {
+            return BeanUtil.toBean(map, R.class);
+        }
+
+        String htmlContent = MapUtils.getString(contentData, "htmlContent");
+
+        data.put("content", htmlContent);
+        map.put("data", data);
+
         return BeanUtil.toBean(map, R.class);
     }
 

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

@@ -2,6 +2,7 @@ package com.dsk.system.dskService;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.json.JSONUtil;
 import com.dsk.common.core.domain.R;
 import com.dsk.common.core.domain.model.*;
 import com.dsk.common.core.page.TableDataInfo;
@@ -124,9 +125,10 @@ public class EnterpriseProjectService {
         contentParam.put("data_type", "bid_plan");
         contentParam.put("filter_type", 2);
         contentParam.put("strategy_id", contentId);
-        Map<String, Object> contentMap = dskOpenApiUtil.requestBody("/mongocontent/v1/cjb/mongo_content", BeanUtil.beanToMap(contentParam, false, false));
+        Map<String, Object> contentMap = dskOpenApiUtil.requestBody("/mongocontent/v1/cjb/mongo_content", contentParam);
 
         Map contentData = MapUtils.getMap(contentMap, "data", null);
+        log.info("contentData:{}", JSONUtil.toJsonStr(contentData));
 
         if (200 != MapUtils.getInteger(contentMap, "code", 300)) {
             return BeanUtil.toBean(map, R.class);
@@ -134,7 +136,8 @@ public class EnterpriseProjectService {
 
         String htmlContent = MapUtils.getString(contentData, "htmlContent");
 
-        map.put("content", htmlContent);
+        data.put("content", htmlContent);
+        map.put("data", data);
 
         return BeanUtil.toBean(map, R.class);
     }

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

 package com.dsk.system.service.impl;
 
 import com.dsk.common.core.domain.entity.BusinessFollowRecord;
-import com.dsk.common.exception.base.BaseException;
 import com.dsk.common.utils.DateUtils;
-import com.dsk.common.utils.SecurityUtils;
 import com.dsk.system.domain.BusinessIdDto;
 import com.dsk.system.domain.BusinessListDto;
 import com.dsk.system.domain.vo.BusinessListVo;
@@ -47,12 +45,12 @@ public class BusinessFollowRecordServiceImpl implements IBusinessFollowRecordSer
 
     @Override
     public List<BusinessFollowRecord> allFollow(BusinessListDto dto) {
-        //userId不传值，就查询全部门项目
-        if (dto.getUserId() == null) {
-            Long deptId = SecurityUtils.getLoginUser().getDeptId();
-            if (deptId == null) throw new BaseException("请登录");
-            dto.setDeptId(deptId.intValue());
-        }
+        //userId不传值，就查询全部
+//        if (dto.getUserId() == null) {
+//            Long deptId = SecurityUtils.getLoginUser().getDeptId();
+//            if (deptId == null) throw new BaseException("请登录");
+//            dto.setDeptId(deptId.intValue());
+//        }
         return businessFollowRecordMapper.allFollow(dto);
     }
 

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

@@ -32,6 +32,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -80,13 +81,21 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
      */
     @Override
     public List<BusinessListVo> selectBusinessInfoList(BusinessListDto dto) {
-        //userId不传值，就查询全部门项目
+        List<BusinessListVo> othersList = new ArrayList<>();
+        //userId不传值，就查询全部他人可见项目+自己的
         if (dto.getUserId() == null) {
-            Long deptId = SecurityUtils.getLoginUser().getDeptId();
-            if (deptId == null) throw new BaseException("请登录");
-            dto.setDeptId(deptId.intValue());
+            Long userId = SecurityUtils.getLoginUser().getUserId();
+            if (userId == null) throw new BaseException("请登录");
+            dto.setOthers(userId.intValue());
+            //查询他人可见项目
+            othersList = businessInfoMapper.selectBusinessInfoList(dto);
+
         }
-        return businessInfoMapper.selectBusinessInfoList(dto);
+        dto.setOthers(null);
+        //查询自己参与的项目
+        List<BusinessListVo> businessList = businessInfoMapper.selectBusinessInfoList(dto);
+        businessList.addAll(othersList);
+        return businessList;
     }
 
     @Override
@@ -146,7 +155,7 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
             }
         }
         result.add("导入项目成功条数" + rowSuccess);
-        result.add("导入项目失败条数" + errorCount);
+        result.add("导入项目去重条数" + errorCount);
         AjaxResult success = AjaxResult.success(String.join(",", result));
         success.put("successCount",rowSuccess);
         return success;

dsk-system/src/main/resources/mapper/business/BusinessFollowRecordMapper.xml

@@ -72,9 +72,6 @@
             <if test="userId != null">
                 and f.user_id = #{userId}
             </if>
-            <if test="deptId != null">
-                and u.dept_id = #{deptId}
-            </if>
         </where>
         ORDER BY f.creat_time DESC
     </select>

dsk-system/src/main/resources/mapper/business/BusinessInfoMapper.xml

@@ -131,8 +131,8 @@
             <if test="userId != null">
                 and bu.user_id = #{userId}
             </if>
-            <if test="deptId != null">
-                and bu.dept_id = #{deptId} and i.is_private = 1
+            <if test="others != null">
+                 and bu.user_id != #{others} and i.is_private = 1
             </if>
 
             <if test="provinceId != null and provinceId.size > 0 and cityId == null and districtId == null">