Merge branch 'v1.1-dev' of http://192.168.0.200:3000/wanglang/trade-platform into v1.1-dev

trade-admin/src/main/java/com/trade/admin/system/mapper/SysMenuMapper.java

@@ -33,7 +33,7 @@ public interface SysMenuMapper {
      * @param menu 菜单信息
      * @return 菜单列表
      */
-    List<SysMenu> selectMenuListByUserId(SysMenu menu,@Param("userId") Long userId);
+    List<SysMenu> selectMenuListByUserId(@Param("menu") SysMenu menu,@Param("userId") Long userId);
 
     /**
      * 根据角色ID查询权限

trade-admin/src/main/java/com/trade/admin/trade/filingdoc/controller/FilingDocController.java

@@ -63,7 +63,7 @@ public class FilingDocController {
      * @return 备案单证列表
      */
     @RequestMapping("/list")
-    @PreAuthorize("@ss.hasPermi('trade:filingDoc:list')")
+    @PreAuthorize("@ss.hasPermi('financial:taxManage:filingDoc')")
     public ResponseResult<GridPage<TaxRebateSummaryDataDto>> getSummaryDataByPage(TaxRebateSummarySearchDto search) {
         // 直接复用退税汇总页面，数据一致
         return ResponseResult.success(exportTaxRebateService.getTaxRebateSummaryDataPagesBySearch(search));
@@ -73,7 +73,7 @@ public class FilingDocController {
      * 出口单证列表
      */
     @RequestMapping("/exportDocList")
-    @PreAuthorize("@ss.hasPermi('trade:filingDoc:exportDoc:list')")
+    @PreAuthorize("@ss.hasPermi('financial:taxManage:filingDocView')")
     public ResponseResult<PageInfo<SalesContract4FilingDocVO>> salesContracts(Contract4FilingDocSearch search) {
         return ResponseResult.success(salesContractService.queryList4FilingDocBySearch(search));
     }
@@ -82,7 +82,7 @@ public class FilingDocController {
      * 进货单证列表
      */
     @RequestMapping("/purchaseDocList")
-    @PreAuthorize("@ss.hasPermi('trade:filingDoc:purchaseDoc:list')")
+    @PreAuthorize("@ss.hasPermi('financial:taxManage:filingDocView')")
     public ResponseResult<PageInfo<PurchaseContract4FilingDocVO>> purchaseContracts(Contract4FilingDocSearch search) {
         return ResponseResult.success(purchasingContractService.queryList4FilingDocBySearch(search));
     }

trade-admin/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -66,14 +66,14 @@
 		left join sys_user_role ur on rm.role_id = ur.role_id
 		left join sys_role ro on ur.role_id = ro.id
 		where ur.user_id = #{userId}
-		<if test="menuName != null and menuName != ''">
-            AND m.menu_name like concat('%', #{menuName}, '%')
+		<if test="menu.menuName != null and menu.menuName != ''">
+            AND m.menu_name like concat('%', #{menu.menuName}, '%')
 		</if>
-		<if test="visible != null and visible != ''">
-            AND m.visible = #{visible}
+		<if test="menu.visible != null and menu.visible != ''">
+            AND m.visible = #{menu.visible}
 		</if>
-		<if test="status != null and status != ''">
-            AND m.status = #{status}
+		<if test="menu.status != null and menu.status != ''">
+            AND m.status = #{menu.status}
 		</if>
 		order by m.parent_id, m.order_num
 	</select>