Browse Source

bugfix-列表排序

Aslee 3 năm trước cách đây
mục cha
commit
7bef8e94dc

+ 1 - 1
src/main/java/com/caimei/service/impl/ShopServiceImpl.java

@@ -196,7 +196,7 @@ public class ShopServiceImpl implements ShopService {
                 return ResponseJson.error("该供应商名称已经存在,请重新输入", null);
             }
             // 添加时验证appId是否已被使用
-            if (null != userIdByAppId) {
+            if (StringUtils.isNotEmpty(appId) && null != userIdByAppId) {
                 return ResponseJson.error("该appId已被使用,请重新输入", null);
             }
         } else {

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

@@ -76,7 +76,7 @@
         </if>
         <choose>
             <when test="listType == 2">
-                order by a.auditStatus desc,waitAuditNum desc, a.createTime desc
+                order by (case a.auditStatus 2 then 2 when 0 then 1 else 0) end desc,waitAuditNum desc, a.createTime desc
             </when>
             <otherwise>
                 order by a.createTime desc

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

@@ -102,7 +102,7 @@
         </if>
         <choose>
             <when test="listType == 2">
-                order by p.auditStatus desc,p.createTime desc
+                order by (case p.auditStatus 2 then 2 when 0 then 1 else 0) desc,p.createTime desc
             </when>
             <otherwise>
                 order by p.createTime desc

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

@@ -68,7 +68,7 @@
         </if>
         <choose>
             <when test="listType == 2">
-                order by a.auditStatus desc, a.createTime desc
+                order by (case a.auditStatus 2 then 2 when 0 then 1 else 0) desc, a.createTime desc
             </when>
             <otherwise>
                 order by a.createTime desc