Merge remote-tracking branch 'origin/master'

jwtech-system/src/main/java/com/kms/enterprise/mapper/BsSgcYxjdEnterpriseInfoMapper.java

@@ -38,7 +38,7 @@ public interface BsSgcYxjdEnterpriseInfoMapper extends BaseMapper<BsSgcYxjdEnter
                                              @Param("enterpriseName") String enterpriseName,
                                              @Param("adcd") String xzqhId,
                                              @Param("orderBy") String createTime,
-                                             Page<Object> objectPage);
+                                             Page objectPage);
 
     IPage<BsSgcYxjdEnterpriseInfo> listProject(@Param("adcd") String subString,
                                                @Param("enterpriseName") String enterpriseName,

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

@@ -14,7 +14,8 @@
                legal_representative,
                corporate_id_number,
                id,
-               unified_social_credit_code
+               unified_social_credit_code,
+               score
         from bs_sgc_yxjd_enterprise_info ei
     </sql>
 
@@ -79,7 +80,6 @@
                 <if test="enterpriseName!=null and enterpriseName!=''">
                     and enterprise_name like concat('%',#{enterpriseName},'%')
                 </if>
-
             </where>
             order by ${orderBy} desc
         </if>
@@ -89,13 +89,21 @@
                 <if test="enterpriseName!=null and enterpriseName!=''">
                     and enterprise_name like concat('%',#{enterpriseName},'%')
                 </if>
-
-                <if test="adcd!=null and adcd !=''">
+                <if test="adcd != null and adcd !='' and userId != 1">
                     and adcd like concat(#{adcd},'%')
                 </if>
             </where>
             order by ${orderBy} desc
         </if>
+        <if test="userType==99">
+            <where>
+                1=1
+                <if test="enterpriseName!=null and enterpriseName!=''">
+                    and enterprise_name like concat('%',#{enterpriseName},'%')
+                </if>
+            </where>
+            order by ${orderBy} desc
+        </if>
         <!--<if test="userType==01">
             WHERE
             ei.PRO_NO IN (
@@ -146,8 +154,8 @@
             </where>
             order by ${orderBy} desc
         </if>-->
-
     </select>
+
     <select id="listProject" resultMap="EnterpriseInfo">
         select *
         from bs_sgc_yxjd_enterprise_info ei