submit

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

@@ -81,11 +81,11 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
     @Override
     public List<BusinessListVo> selectBusinessInfoList(BusinessListDto dto) {
         //userId不传值，就查询全部门项目
-        if (dto.getUserId() == null) {
-            Long deptId = SecurityUtils.getLoginUser().getDeptId();
-            if (deptId == null) throw new BaseException("请登录");
-            dto.setDeptId(deptId.intValue());
-        }
+//        if (dto.getUserId() == null) {
+//            Long deptId = SecurityUtils.getLoginUser().getDeptId();
+//            if (deptId == null) throw new BaseException("请登录");
+//            dto.setDeptId(deptId.intValue());
+//        }
         return businessInfoMapper.selectBusinessInfoList(dto);
     }
 
@@ -146,7 +146,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="userId == null">
+                 and i.is_private = 1
             </if>
 
             <if test="provinceId != null and provinceId.size > 0 and cityId == null and districtId == null">