From 7a1ac9bed4386e1f502952c4ced52fe2f9696a70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=85=95=E6=9C=88=E9=9C=9C=E7=AC=99?=
 <13508313+moonlight-frost-sheng@user.noreply.gitee.com>
Date: Fri, 10 May 2024 17:10:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E7=AB=AFbug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/BsSgcjsjdBuiProInfoMapper.java     |  1 +
 .../service/BsSgcjsjdBuiProInfoService.java   | 28 +++++++++----------
 .../mapper/BsSgcYxjdEnterpriseInfoMapper.java |  1 +
 .../BsSgcYxjdEnterpriseInfoService.java       |  3 +-
 .../build/BsSgcjsjdBuiProInfoMapper.xml       |  5 ++--
 .../BsSgcYxjdEnterpriseInfoMapper.xml         | 19 ++++++++++---
 6 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcjsjdBuiProInfoMapper.java b/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcjsjdBuiProInfoMapper.java
index 704d9055..22e21e0b 100644
--- a/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcjsjdBuiProInfoMapper.java
+++ b/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcjsjdBuiProInfoMapper.java
@@ -55,6 +55,7 @@ public interface BsSgcjsjdBuiProInfoMapper extends BaseMapper<BsSgcjsjdBuiProInf
                                                 Page page);
 
     IPage<AssertStatisticsDto> selectPageByCode(@Param("userId") String userId,
+                                                @Param("userType") String userType,
                                                 @Param("id") String id,
                                                 @Param("projectName") String projectName,
                                                 @Param("isMajor") String isMajor,
diff --git a/jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java b/jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java
index 496fae5b..4cc098f9 100644
--- a/jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java
+++ b/jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java
@@ -28,10 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 
 /**
@@ -239,7 +236,7 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
         SysDept sysDept = sysDeptService.get(deptId);
         String xzqhId = sysDept.getXzqhId();
 
-        list = bsSgcjsjdBuiProInfoMapper.selectPageByCode(sysUser.getId(),data.getId(), data.getProjectName(), isMajor, data.getProjectType(),
+        list = bsSgcjsjdBuiProInfoMapper.selectPageByCode(sysUser.getId(),sysUser.getUserType(),data.getId(), data.getProjectName(), isMajor, data.getProjectType(),
                 sysXzqhService.getSubString(xzqhId),
                 "create_time", new Page<>(sp.getPageNum(), sp.getPageSize()));
 
@@ -316,20 +313,21 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
                 use.setMs(list.get(i).getNum());
             }
             for (int j = 0; j < list.size(); j++) {
-                if (list.get(i).getCity().equals(list.get(j).getCity())
-                        && !list.get(i).getIsMajor().equals(list.get(j).getIsMajor())) {
-                    if (list.get(j).getIsMajor().equals("zd")) {
-                        use.setZd(list.get(j).getNum());
+                if (!ObjectUtil.isEmpty(list.get(i).getCity())) {
+                    if (list.get(i).getCity().equals(list.get(j).getCity())
+                            && !list.get(i).getIsMajor().equals(list.get(j).getIsMajor())) {
+                        if (list.get(j).getIsMajor().equals("zd")) {
+                            use.setZd(list.get(j).getNum());
+                        } else {
+                            use.setMs(list.get(j).getNum());
+                        }
+
+                        map.put(list.get(i).getCity(), use);
                     } else {
-                        use.setMs(list.get(j).getNum());
+                        map.put(list.get(i).getCity(), use);
                     }
-
-                    map.put(list.get(i).getCity(), use);
-                } else {
-                    map.put(list.get(i).getCity(), use);
                 }
 
-
             }
 
 
diff --git a/jwtech-system/src/main/java/com/kms/enterprise/mapper/BsSgcYxjdEnterpriseInfoMapper.java b/jwtech-system/src/main/java/com/kms/enterprise/mapper/BsSgcYxjdEnterpriseInfoMapper.java
index 6b3d94ed..42e07160 100644
--- a/jwtech-system/src/main/java/com/kms/enterprise/mapper/BsSgcYxjdEnterpriseInfoMapper.java
+++ b/jwtech-system/src/main/java/com/kms/enterprise/mapper/BsSgcYxjdEnterpriseInfoMapper.java
@@ -37,6 +37,7 @@ public interface BsSgcYxjdEnterpriseInfoMapper extends BaseMapper<BsSgcYxjdEnter
                                              @Param("proCode") String proCode,
                                              @Param("enterpriseName") String enterpriseName,
                                              @Param("adcd") String xzqhId,
+                                             @Param("queryAccd") String accd,
                                              @Param("orderBy") String createTime,
                                              Page objectPage);
 
diff --git a/jwtech-system/src/main/java/com/kms/enterprise/service/BsSgcYxjdEnterpriseInfoService.java b/jwtech-system/src/main/java/com/kms/enterprise/service/BsSgcYxjdEnterpriseInfoService.java
index b635d52e..bd00bec6 100644
--- a/jwtech-system/src/main/java/com/kms/enterprise/service/BsSgcYxjdEnterpriseInfoService.java
+++ b/jwtech-system/src/main/java/com/kms/enterprise/service/BsSgcYxjdEnterpriseInfoService.java
@@ -148,8 +148,7 @@ public class BsSgcYxjdEnterpriseInfoService extends BaseService<BsSgcYxjdEnterpr
         BsSgcYxjdEnterpriseInfo data = sp.getData();
         IPage<BsSgcYxjdEnterpriseInfo> page = bsSgcYxjdEnterpriseInfoMapper.getByUser(sysUser.getId(),
                 sysUser.getUserType(), data.getProNo(), data.getProCode(),data.getEnterpriseName(),
-                sysXzqhService.getSubString(sysDept.getXzqhId()), "create_time", new Page<>(sp.getPageNum(), sp.getPageSize()));
-
+                sysXzqhService.getSubString(sysDept.getXzqhId()),data.getAdcd(), "create_time", new Page<>(sp.getPageNum(), sp.getPageSize()));
         return page;
     }
 
diff --git a/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml b/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml
index bc85e68b..fe49325c 100644
--- a/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml
+++ b/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml
@@ -227,7 +227,7 @@
             <if test="projectType!=null and projectType!=''">
                 and pp.project_type=#{projectType}
             </if>
-            <if test="userId!=null and userId!=''">
+            <if test="userId!=null and userId!='' and userType!=00">
                 and pp.PRO_NO IN (
                 SELECT
                 PRO_NO
@@ -242,8 +242,7 @@
             <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
         </where>
         GROUP BY pi.PRO_CODE
-        order by pi.${orderBy} desc
-
+        order by pi.PRO_CODE desc
     </select>
 
     <resultMap id="Gzjb" type="com.kms.build.domain.dto.GzjbDto">
diff --git a/jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdEnterpriseInfoMapper.xml b/jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdEnterpriseInfoMapper.xml
index 19680fe0..2dcf2b97 100644
--- a/jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdEnterpriseInfoMapper.xml
+++ b/jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdEnterpriseInfoMapper.xml
@@ -83,15 +83,26 @@
         </if>
         <if test="userType==00">
             <where>
-            1=1
+                1=1
+            <if test='userId != "1"'>
+            AND unified_social_credit_code = (
+            SELECT
+            IFNULL( sd.unified_social_credit_code,1)
+            FROM
+            sys_user su left join sys_dept sd on su.dept_id=sd.id
+             AND su.id=#{userId} LIMIT 1)
+            </if>
                 <if test="enterpriseName!=null and enterpriseName!=''">
                     and enterprise_name like concat('%',#{enterpriseName},'%')
                 </if>
-                <if test="adcd != null and adcd !='' and userId != 1">
-                    and adcd like concat(#{adcd},'%')
+<!--                <if test=' adcd != null and adcd !=""'>-->
+<!--                    and adcd like concat(#{adcd},'%')-->
+<!--                </if>-->
+                <if test="queryAccd != null and queryAccd != ''">
+                    and adcd like concat(#{queryAccd},'%')
                 </if>
             </where>
-            order by ${orderBy} desc
+<!--            order by ${orderBy} desc-->
         </if>
         <if test="userType==99">
             <where>