Merge branch 'develop' of http://132.232.206.88:3000/lift-manager/lift-server into huangyuan-user

lift-business-service/src/main/resources/mapper/lift/LiftMapper.xml

@@ -84,7 +84,7 @@
         LEFT JOIN project_lift_relevance plr ON pclr.mt_company_id = plr.mt_company_id AND pclr.lift_id = plr.lift_id
         LEFT JOIN project p ON pclr.mt_company_id = p.mt_company_id AND plr.project_id = p.id
         LEFT JOIN lift_brand lb ON l.lift_brand = lb.code
-        WHERE 1 = 1;
+        WHERE 1 = 1
         <if test="request.mtCompanyId!=null and request.mtCompanyId!=''">
             AND pclr.mt_company_id = #{request.mtCompanyId,jdbcType=BIGINT}
         </if>

lift-business-service/src/main/resources/mapper/project/ProjectUserMapper.xml

@@ -42,11 +42,11 @@
 		FROM project_user pu
 			 LEFT JOIN user_info ui ON pu.user_id = ui.user_id
 		WHERE 1=1
-		<if test="id!=null and id!=''">
-			AND project_id = #{id,jdbcType=BIGINT}
+		<if test="request.id!=null and request.id!=''">
+			AND project_id = #{request.id,jdbcType=BIGINT}
 		</if>
-		<if test="mtCompanyId!=null and mtCompanyId!=''">
-			AND mt_company_id = #{mtCompanyId,jdbcType=BIGINT}
+		<if test="request.mtCompanyId!=null and request.mtCompanyId!=''">
+			AND mt_company_id = #{request.mtCompanyId,jdbcType=BIGINT}
 		</if>
 	</select>
 

lift-quan-service/src/main/java/cn/com/ty/lift/quan/news/controller/QuanNewsController.java

@@ -43,7 +43,10 @@ public class QuanNewsController {
      */
     @PostMapping("/newsList")
     public RestResponse newsList(@RequestBody QuanNewsReq quanNews) {
-        return RestResponse.success(quanNewsService.page(new Page<>(quanNews.getPageNum(), quanNews.getPageSize())));
+        return RestResponse.success(quanNewsService.page(
+                        new Page<>(quanNews.getPageNum(),
+                                quanNews.getPageSize()),
+                Wrappers.<QuanNews>query().orderByDesc("release_date")));
     }
 
     /**