排序字段

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/controller/UmsCompanyController.java

@@ -91,6 +91,15 @@ public class UmsCompanyController {
         return CommonResult.success(list);
     }
 
+    @ApiOperation(value = "获取供应商列表")
+    @GetMapping("/select/alllist")
+    @ResponseBody
+    public CommonResult alllist(){
+
+        List<SelectVo> list = umsCompanyService.alllist();
+        return CommonResult.success(list);
+    }
+
     @ApiOperation(value = "获取供应商详细信息")
     @GetMapping("/dt/detail")
     @ResponseBody

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/dao/UmsCompanyInfoDao.java

@@ -12,4 +12,6 @@ public interface UmsCompanyInfoDao {
     long deleteCheck(Long id);
 
     List<SelectNewVo> selectList(@Param("compId") Long compId);
+
+    List<SelectVo> alllist();
 }

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/UmsCompanyService.java

@@ -120,4 +120,6 @@ public interface UmsCompanyService {
 
 
     List<SelectNewVo> selectList();
+
+    List<SelectVo> alllist();
 }

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/impl/UmsCompanyInfoServiceImpl.java

@@ -371,4 +371,9 @@ public class UmsCompanyInfoServiceImpl implements UmsCompanyService {
         return umsCompanyInfoDao.selectList(compIdInfo);
     }
 
+    @Override
+    public List<SelectVo> alllist(){
+        return umsCompanyInfoDao.alllist();
+    }
+
 }

forest-admin/admin-server/src/main/resources/dao/ProductExcelDao.xml

@@ -177,7 +177,9 @@
         <if test="search != null and search != ''">
             AND concat(a.`name`, a.brand_name) LIKE concat(concat('%', #{search}, '%'))
         </if>
-        order by a.create_time desc
+        order by
+        a.sort ASC,
+        a.create_time DESC
     </select>
 
     <resultMap id="bigDatainfoMap" type="com.hwrj.cloud.admin.dto.param.BigDataListInfoVo">

forest-admin/admin-server/src/main/resources/dao/UmsCompanyInfoDao.xml

@@ -53,4 +53,18 @@
             a.id DESC
 
     </select>
+    <select id="alllist" resultType="com.hwrj.cloud.admin.dto.param.SelectVo">
+        SELECT
+        a.id AS 'lable',
+        a.comp_name AS text
+        FROM
+        ums_company_info a
+        WHERE
+        a.comp_status = 0
+        <if test="compId !='' and compId">
+            AND a.id = #{compId}
+        </if>
+        ORDER BY
+        a.id DESC
+    </select>
 </mapper>

forest-portal/portal-server/src/main/java/com/hwrj/cloud/portal/service/impl/PmsPortalProductServiceImpl.java

@@ -75,6 +75,8 @@ public class PmsPortalProductServiceImpl implements PmsPortalProductService {
             }
 
         }
+        //默认按排序字段
+        example.setOrderByClause("sort asc");
         //1->按新品；2->按销量；3->价格从低到高；4->价格从高到低
         if (sort == 1) {
             example.setOrderByClause("id desc");