修改

jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiProgressService.java

@@ -50,8 +50,6 @@ public class BsSgcJsjdBuiProgressService extends BaseService<BsSgcJsjdBuiProgres
                 data.getProjectType(),
                 sysXzqhService.getSubString(xzqhId),
                 "create_time",new Page<>(sp.getPageNum(), sp.getPageSize()));
-
-
         return list;
     }
 }

jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java

@@ -309,7 +309,6 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
         List<HistogramDto> list = bsSgcjsjdBuiProInfoMapper.getHistogram(user.getId(),user.getUserType());
         HashMap<String, Use> map = new HashMap<>();
         for (int i = 0; i < list.size(); i++) {
-
             Use use = new Use();
             if (list.get(i).getIsMajor().equals("zd")) {
                 use.setZd(list.get(i).getNum());
@@ -317,8 +316,6 @@ 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")) {

jwtech-system/src/main/resources/mapper/build/BsSgcJsjdBuiProgressMapper.xml

@@ -56,8 +56,8 @@
             order by pi.${orderBy} desc
         </if>
         <if test="userType==00">
-            1 = 1
             <where>
+                1 = 1
                 <if test="projectName!=null and projectName!=''">
                     and project_name like concat('%',#{projectName},'%')
                 </if>

jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectFeasibilityMapper.xml

@@ -74,6 +74,7 @@
         pf.PROJECT_INVESTMENT_ESTIMATE,
         pf.APPROVAL_OPINION,
         pf.create_time
+        from  bs_slgc_qqjd_spe_pro_fea pf left join bs_slgc_qqjd_spe_pro_proposal pp on pp.pro_no=pf.pro_no and pp.project_code=pf.project_code
         <if test="userType==01">
             WHERE
             pp.PRO_NO IN (

jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdEnterpriseInfoMapper.xml

@@ -67,16 +67,14 @@
         <include refid="info"></include>
         <if test="userType==01">
             WHERE
-            unified_social_credit_code IN (
+            unified_social_credit_code = (
             SELECT
-            sd.unified_social_credit_code
+            IFNULL( sd.unified_social_credit_code,1)
             FROM
             sys_user su left join sys_dept sd on su.dept_id=sd.id
             <where>
                 1 = 1
-                <if test="userId!=null and userId!=''">
-                    AND su.id=#{userId})
-                </if>
+                AND su.id=#{userId})
                 <if test="enterpriseName!=null and enterpriseName!=''">
                     and enterprise_name like concat('%',#{enterpriseName},'%')
                 </if>