Aslee 2 years ago
parent
commit
215d73ffe6

+ 3 - 3
src/main/resources/mapper/AuthMapper.xml

@@ -261,13 +261,13 @@
           and a.id = #{authId}
     </select>
     <select id="getAuthFormById" resultType="com.caimei.model.vo.AuthFormVo">
-        select id as authId,
+        select id                                                                           as authId,
                authParty,
                authUserId,
                a.provinceId,
                a.cityId,
                a.townId,
-               concat(p.name, '/', c.name, '/', t.name) as area,
+               concat(ifnull(p.name, ''), '/', ifnull(c.name, ''), '/', ifnull(t.name, '')) as area,
                address,
                lng,
                lat,
@@ -282,7 +282,7 @@
                remarks,
                status,
                auditStatus,
-               if(shopAuditStatus = 0,shopInvalidReason,invalidReason) as invalidReason
+               if(shopAuditStatus = 0, shopInvalidReason, invalidReason)                    as invalidReason
         from cm_brand_auth a
                  left join province p on a.provinceId = p.provinceID
                  left join city c on a.cityId = c.cityID

+ 4 - 0
src/main/resources/mapper/AuthProductMapper.xml

@@ -45,6 +45,10 @@
             <if test="appletsCertificateImage != null and appletsCertificateImage != ''">
                 `appletsCertificateImage`      = #{appletsCertificateImage},
             </if>
+            <if test="name != null and name != ''">
+                name = #{name},
+                image = #{image},
+            </if>
             purchaseWay        = #{purchaseWay},
             invoiceImage       = #{invoiceImage},
             `status`           = #{status},

+ 1 - 1
src/main/resources/mapper/ShopMapper.xml

@@ -137,7 +137,7 @@
         left join (select authUserId, count(*) as zipWaitNum from cm_brand_file where auditStatus = 2 and fileType = 2 group by authUserId) zw on u.authUserId = zw.authUserId
         left join (select authUserId, count(*) as doctorWaitNum from cm_brand_doctor where auditStatus = 2 group by authUserId) dw on u.authUserId = dw.authUserId
         left join (select authUserId, count(*) as productTypeWaitNum from cm_brand_product_type where auditStatus = 2 group by authUserId) tw on u.authUserId = tw.authUserId
-        left join (select authUserId, count(*) as waitSendNum from cm_brand_auth where auditStatus = 2 and sendStatus = 0 group by authUserId) sw on u.authUserId = sw.authUserId
+        left join (select authUserId, count(*) as waitSendNum from cm_brand_auth where auditStatus = 1 and sendStatus = 0 group by authUserId) sw on u.authUserId = sw.authUserId
         where u.userIdentity = 2
         <if test="shopName != null and shopName !=''">
             AND u.name like CONCAT('%',#{shopName},'%')