优化

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseDiscountpackageGetVehQuery.java

@@ -66,4 +66,17 @@ public class BaseDiscountpackageGetVehQuery implements Query {
 
     @ApiModelProperty(value = "orgSid")
     private String orgSid;
+
+    @ApiModelProperty(value = "厂家入库开始日期")
+    private String priceStartDate;
+    @ApiModelProperty(value = "厂家入库结束日期")
+    private String priceEndDate;
+    @ApiModelProperty(value = "公司入库开始日期")
+    private String orgPriceStartDate;
+    @ApiModelProperty(value = "公司入库结束日期")
+    private String orgPriceEndDate;
+    @ApiModelProperty(value = "买断开始日期")
+    private String solidStartDate;
+    @ApiModelProperty(value = "买断结束日期")
+    private String solidEndDate;
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basebrandletpricepowimit/BaseBrandletpricepowimitService.java

@@ -123,7 +123,12 @@ public class BaseBrandletpricepowimitService extends MybatisBaseService<BaseBran
                 for (BaseRoleletpricepowimitDetailsVo baseRoleletpricepowimitDetailsVo : baseRoleletpricepowimitDetailsVos) {
                     String roleName = baseRoleletpricepowimitDetailsVo.getRoleName();
                     String letPrice = baseRoleletpricepowimitDetailsVo.getLetPrice();
-                    roleLetPrice.append(roleName).append("(").append(letPrice).append(")").append("、");
+                    String deptName = baseRoleletpricepowimitDetailsVo.getDeptName();
+                    if (StringUtils.isNotBlank(deptName)){
+                        roleLetPrice.append(deptName).append("-").append(roleName).append("(").append(letPrice).append(")").append("、");
+                    }else {
+                        roleLetPrice.append(roleName).append("(").append(letPrice).append(")").append("、");
+                    }
                 }
                 record.setRoleLetPrice(roleLetPrice.substring(0, roleLetPrice.lastIndexOf("、")));
                 String useOrgSid = record.getUseOrgSid();

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -3544,6 +3544,18 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         if (StringUtils.isNotBlank(params.getModelName())) {
             qw.like("bvm.modelName", params.getModelName());
         }
+        //厂家入库日期
+        qw.apply(StringUtils.isNotBlank(params.getPriceStartDate()), "date_format (bv.priceDate,'%Y-%m-%d') >= date_format('" + params.getPriceStartDate() + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(params.getPriceEndDate()), "date_format (bv.priceDate,'%Y-%m-%d') <= date_format('" + params.getPriceEndDate() + "','%Y-%m-%d')"
+                );
+        //公司入库日期
+        qw.apply(StringUtils.isNotBlank(params.getOrgPriceStartDate()), "date_format (bv.orgPriceDate,'%Y-%m-%d') >= date_format('" + params.getOrgPriceStartDate() + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(params.getOrgPriceEndDate()), "date_format (bv.orgPriceDate,'%Y-%m-%d') <= date_format('" + params.getOrgPriceEndDate() + "','%Y-%m-%d')"
+                );
+        //买断日期
+        qw.apply(StringUtils.isNotBlank(params.getSolidStartDate()), "date_format (bv.solidDate,'%Y-%m-%d') >= date_format('" + params.getSolidStartDate() + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(params.getSolidEndDate()), "date_format (bv.solidDate,'%Y-%m-%d') <= date_format('" + params.getSolidEndDate() + "','%Y-%m-%d')"
+                );
         qw.eq("bv.isDelete", 0);
         qw.eq("bv.createOrgSid", params.getOrgSid());
         qw.like("bvb.useOrg", params.getOrgSid());

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationQuery.java

@@ -88,4 +88,5 @@ public class FinBillApplicationQuery implements Query {
     private String name;
 
     private String menuUrl;
+    private String menuSid;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/AppFinUncollectedReceivablesDetailedQuery.java

@@ -9,11 +9,12 @@ public class AppFinUncollectedReceivablesDetailedQuery implements Query {
 
     @ApiModelProperty("用户sid")
     private String userSid;
-
     @ApiModelProperty("客户名称")
     private String name;
-
     @ApiModelProperty("分公司sid")
     private String useOrgSid;
-
+    @ApiModelProperty("组织全路径")
+    private String orgPath;
+    @ApiModelProperty("菜单sid")
+    private String menuSid;
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@@ -261,11 +261,12 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             query.setUseOrgSid(useOrgSid);
         }
         //========================================数据授权开始
-        if(StringUtils.isNotBlank(query.getMenuUrl())){
+        if(StringUtils.isNotBlank(query.getMenuUrl()) || StringUtils.isNotBlank(query.getMenuSid())){
             //=======================
             PrivilegeQuery privilegeQuery = new PrivilegeQuery();
             privilegeQuery.setOrgPath(query.getOrgPath());
             privilegeQuery.setMenuUrl(query.getMenuUrl());
+            privilegeQuery.setMenuSid(query.getMenuSid());
             privilegeQuery.setUserSid(query.getCreateBySid());
             ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
             if(StringUtils.isNotBlank(defaultIdReltBean.getData())){

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java

@@ -539,7 +539,55 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
         if (StringUtils.isNotBlank(useOrgSid)) {
             pq.getParams().setUseOrgSid(useOrgSid);
         }
-        QueryWrapper<FinUncollectedReceivablesDetailed> qw = appCreateQueryWrapper(pq.getParams());
+        QueryWrapper<FinUncollectedReceivablesDetailed> qw = new QueryWrapper<>();
+        AppFinUncollectedReceivablesDetailedQuery query = pq.getParams();
+        String orgPath = query.getOrgPath();
+        if (StringUtils.isNotBlank(query.getMenuSid())){
+            //授权
+            PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+            privilegeQuery.setOrgPath(query.getOrgPath());
+            privilegeQuery.setMenuUrl(query.getMenuSid());
+            privilegeQuery.setUserSid(query.getUserSid());
+            ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+            if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+                //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+                orgPath = orgPath + "/";
+                int i1 = orgPath.indexOf("/");
+                int i2 = orgPath.indexOf("/", i1 + 1);
+                int i3 = orgPath.indexOf("/", i2 + 1);
+                int i4 = orgPath.indexOf("/", i3 + 1);
+                String orgLevelKey = defaultIdReltBean.getData();
+                if ("1".equals(orgLevelKey)) {
+                    orgPath = orgPath.substring(0, i1);
+                    qw.like("orgSidPath", orgPath);
+                } else if ("2".equals(orgLevelKey)) {
+                    orgPath = orgPath.substring(0, i2);
+                    qw.like("orgSidPath", orgPath);
+                } else if ("3".equals(orgLevelKey)) {
+                    orgPath = orgPath.substring(0, i3);
+                    qw.like("orgSidPath", orgPath);
+                } else if ("4".equals(orgLevelKey)) {
+                    orgPath = orgPath.substring(0, i4);
+                    qw.like("orgSidPath", orgPath);
+                } else if ("5".equals(orgLevelKey)) {
+                    qw.eq("createBySid", query.getUserSid());
+                } else {
+                    PagerVo<AppCustomerBillSummaryDetailsVo> p = new PagerVo<>();
+                    return p;
+                }
+            } else {
+                PagerVo<AppCustomerBillSummaryDetailsVo> p = new PagerVo<>();
+                return p;
+            }
+        }else {
+            qw.eq("useOrgSid", query.getUseOrgSid());
+        }
+        if (StringUtils.isNotBlank(query.getName())) {
+            qw.like("contractName", query.getName());
+        }
+        if (StringUtils.isNotBlank(query.getName())) {
+            qw.like("contractNo", query.getName());
+        }
         IPage<FinUncollectedReceivablesDetailed> page = PagerUtil.queryToPage(pq);
         IPage<AppCustomerBillSummaryDetailsVo> pagging = baseMapper.getCustomerBillList(page, qw);
         for (AppCustomerBillSummaryDetailsVo record : pagging.getRecords()) {

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@@ -29,7 +29,7 @@ public enum ProcDefEnum {
     FINPAYAPPLY("付款申请", "process_gin2tntb:4:725020"),
     //RECORDAPPLICATION("入库申请", "process_xbwq2c7p:4:1232504"),
     RECORDAPPLICATION("入库申请", "process_xbwq2c7p:5:1742504"),
-    SCMVEHICLERETURN("采购退库", "process_入库申请md8aeoap:2:722508"),
+    SCMVEHICLERETURN("采购退库", "process_md8aeoap:2:722508"),
     SEALAPPLY("盖章申请", "process_7h0z66tp:1:240064"),
     SALESORDER("销售订单审批流程", "process_p5ils2rn:10:1250008"),
     BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:5:722504"),

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleDataDto.java

@@ -0,0 +1,30 @@
+package com.yxt.anrui.portal.api.sysmenurole;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysMenuRoleDto.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleDto <br/>
+ * Description: 菜单与角色关联表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "菜单与角色关联表 数据传输对象", description = "菜单与角色关联表 数据传输对象")
+@Data
+public class SysMenuRoleDataDto implements Dto {
+
+    @ApiModelProperty("菜单与角色关联表sid")
+    private String sid;
+    @ApiModelProperty("数据权限ID(1集团、2事业部、3分公司、4部门、5个人)")
+    private String dataRuleId;
+}

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleDataQuery.java

@@ -0,0 +1,32 @@
+package com.yxt.anrui.portal.api.sysmenurole;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysMenuRoleQuery.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleQuery <br/>
+ * Description: 菜单与角色关联表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "菜单与角色关联表 查询条件", description = "菜单与角色关联表 查询条件")
+@Data
+public class SysMenuRoleDataQuery implements Query {
+
+	@ApiModelProperty("角色sid")
+    private String roleSid;
+	@ApiModelProperty("菜单名称")
+    private String menuName;
+}

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleDataVo.java

@@ -0,0 +1,32 @@
+package com.yxt.anrui.portal.api.sysmenurole;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysMenuRoleVo.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleVo <br/>
+ * Description: 菜单与角色关联表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "菜单与角色关联表 视图数据对象", description = "菜单与角色关联表 视图数据对象")
+@Data
+public class SysMenuRoleDataVo implements Vo {
+
+    @ApiModelProperty("菜单与角色关联表sid")
+    private String sid;
+	@ApiModelProperty("菜单名称")
+    private String name;
+    @ApiModelProperty("数据权限ID(1集团、2事业部、3分公司、4部门、5个人)")
+    private String dataRuleId;
+}

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleDto.java

@@ -26,7 +26,6 @@ public class SysMenuRoleDto implements Dto {
     
 	@ApiModelProperty("菜单sid")
     private String menuSid;
-    
 	@ApiModelProperty("角色sid")
     private String roleSid;
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleFeign.java

@@ -39,6 +39,14 @@ public interface SysMenuRoleFeign {
     @PostMapping("/listAll")
     public ResultBean<List<SysMenuRoleVo>> listAll(@RequestBody SysMenuRoleQuery query);
 
+    @ApiOperation("根据角色查询授权的菜单列表")
+    @PostMapping("/selMenuByRole")
+    public ResultBean<List<SysMenuRoleDataVo>> selMenuByRole(@RequestBody SysMenuRoleDataQuery query);
+
+    @ApiOperation("修改角色菜单的数据权限")
+    @PostMapping("/updateDataByRoleMenu")
+    public ResultBean updateDataByRoleMenu(@RequestBody List<SysMenuRoleDataDto> dtos);
+
     @ApiOperation("所有数据列表")
     @GetMapping("/list")
     public ResultBean<List<SysMenuRoleVo>> list();

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleFeignFallback.java

@@ -35,6 +35,16 @@ public class SysMenuRoleFeignFallback implements SysMenuRoleFeign {
 		return rb.setMsg("接口anrui_portal/sysmenurole/listAll无法访问");
 	}
 
+	@Override
+	public ResultBean<List<SysMenuRoleDataVo>> selMenuByRole(SysMenuRoleDataQuery query) {
+		return null;
+	}
+
+	@Override
+	public ResultBean updateDataByRoleMenu(List<SysMenuRoleDataDto> dtos) {
+		return null;
+	}
+
 	@Override
 	public ResultBean<List<SysMenuRoleVo>> list(){
 		ResultBean rb = ResultBean.fireFail();

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionService.java

@@ -272,16 +272,16 @@ public class SysFunctionService extends MybatisBaseService<SysFunctionMapper, Sy
             List<Map<String, Object>> lmenus = baseMapper.getMenuAuthorization(sid);
             lmenus.forEach(ff -> {
                 Map<String, Object> map = new HashMap<>();
-                map.put("name", ff.get("name"));
-                String sids = ff.get("sid").toString();
-                map.put("sid", sids);
-                map.put("checked", "1");
-                map.put("children", new ArrayList<>());
                 if (ff.get("pageUrl") != null && com.yxt.common.base.utils.StringUtils.isNotBlank(ff.get("pageUrl").toString())) {
                     String pageUrl = ff.get("pageUrl").toString();
                     List<Map<String, Object>> lfuncs = baseMapper.getFunctionAuthorization(pageUrl);
                     List<Map<String, Object>> functionByRoleSid = baseMapper.getFunctionByRoleSid(pageUrl, roleSid);
                     if (lfuncs.size() > 0){
+                        map.put("name", ff.get("name"));
+                        String sids = ff.get("sid").toString();
+                        map.put("sid", sids);
+                        map.put("checked", "1");
+                        map.put("children", new ArrayList<>());
                         for (Map<String, Object> lfunc : lfuncs) {
                             for (Map<String, Object> funByRole : functionByRoleSid) {
                                 if (lfunc.get("sid").equals(funByRole.get("sid"))) {
@@ -290,10 +290,10 @@ public class SysFunctionService extends MybatisBaseService<SysFunctionMapper, Sy
                             }
                             lfunc.put("children", new ArrayList<>());
                         }
+                        map.put("children", lfuncs);
+                        list2.add(map);
                     }
-                    map.put("children", lfuncs);
                 }
-                list2.add(map);
             });
             f.put("children", list2);
         });

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleMapper.java

@@ -6,10 +6,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.portal.api.sysmenurole.MenuRoleVo;
-import org.apache.ibatis.annotations.Delete;
+import com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleDataVo;
-import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.*;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
 import com.yxt.anrui.portal.api.sysmenurole.SysMenuRole;
 import com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleVo;
 
@@ -47,4 +45,9 @@ public interface SysMenuRoleMapper extends BaseMapper<SysMenuRole> {
     List<SysMenuRoleVo> list(@Param(Constants.WRAPPER) QueryWrapper<SysMenuRoleVo> qw);
 
     List<MenuRoleVo> selectByRoleSid(String roleSid);
+
+    List<SysMenuRoleDataVo> selMenuByRole(@Param(Constants.WRAPPER) QueryWrapper qw);
+
+    @Update("update sys_menu_role set dataRuleId = #{dataRuleId} where sid = #{sid}")
+    void updateDataByRoleMenu(@Param("sid") String sid,@Param("dataRuleId") String dataRuleId);
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleMapper.xml

@@ -1,19 +1,25 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.anrui.portal.biz.sysmenurole.SysMenuRoleMapper">
-<!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    <where> ${ew.sqlSegment} </where>-->
-<!--    ${ew.customSqlSegment} -->
+    <!--    ${ew.customSqlSegment} -->
-	<select id="selectPageVo" resultType="com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleVo">
+    <select id="selectPageVo" resultType="com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleVo">
-		SELECT * FROM sys_menu_role <where> ${ew.sqlSegment} </where>
+        SELECT * FROM sys_menu_role
-	</select>
+        <where>
-	
+            ${ew.sqlSegment}
-	<select id="selectListAllVo" resultType="com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleVo">
+        </where>
-		SELECT * FROM sys_menu_role <where> ${ew.sqlSegment} </where>
+    </select>
-	</select>
+
-	<select id="list" parameterType="com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleQuery"
+    <select id="selectListAllVo" resultType="com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleVo">
-			resultType="com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleVo">
+        SELECT * FROM sys_menu_role
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+    <select id="list" parameterType="com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleQuery"
+            resultType="com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleVo">
         SELECT distinct rm.menuSid as sid,
-                        m.name as menuName,
+                        m.name     as menuName,
                         m.menuUrl,
                         m.pageUrl,
                         m.pageName,
@@ -25,13 +31,25 @@
                         m.pSid,
                         m.sortNo,
                         m.remarks,
-                       1 as alwaysShow
+                        1          as alwaysShow
         FROM sys_menu_role rm
                      LEFT JOIN sys_menu m ON rm.menuSid = m.sid
                 ${ew.customSqlSegment}
     </select>
 
-	<select id="selectByRoleSid" resultType="com.yxt.anrui.portal.api.sysmenurole.MenuRoleVo">
+    <select id="selectByRoleSid" resultType="com.yxt.anrui.portal.api.sysmenurole.MenuRoleVo">
-        select menuSid,dataRuleId from sys_menu_role where roleSid = #{roleSid}
+        select menuSid, dataRuleId
+        from sys_menu_role
+        where roleSid = #{roleSid}
+    </select>
+
+    <select id="selMenuByRole" resultType="com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleDataVo">
+        SELECT smr.sid,sm.`name`,smr.`dataRuleId`
+        FROM sys_menu_role smr
+        LEFT JOIN sys_menu sm
+        ON smr.`menuSid` = sm.`sid`
+        <where>
+            ${ew.sqlSegment}
+        </where>
     </select>
 </mapper>

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleRest.java

@@ -53,6 +53,16 @@ public class SysMenuRoleRest implements SysMenuRoleFeign {
 		return rb.success().setData(list);
 	}
 
+	@Override
+	public ResultBean<List<SysMenuRoleDataVo>> selMenuByRole(SysMenuRoleDataQuery query) {
+		return sysMenuRoleService.selMenuByRole(query);
+	}
+
+	@Override
+	public ResultBean updateDataByRoleMenu(List<SysMenuRoleDataDto> dtos) {
+		return sysMenuRoleService.updateDataByRoleMenu(dtos);
+	}
+
 	@Override
 	public ResultBean<List<SysMenuRoleVo>> list(){
 		ResultBean rb = ResultBean.fireFail();

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleService.java

@@ -8,6 +8,7 @@ import com.yxt.anrui.portal.biz.sysmenu.SysMenuService;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -163,6 +164,27 @@ public class SysMenuRoleService extends MybatisBaseService<SysMenuRoleMapper, Sy
     public List<MenuRoleVo> selectByRoleSid(String roleSid) {
         return baseMapper.selectByRoleSid(roleSid);
     }
+
+    public ResultBean<List<SysMenuRoleDataVo>> selMenuByRole(SysMenuRoleDataQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        QueryWrapper qw = new QueryWrapper<>();
+        qw.eq("smr.roleSid",query.getRoleSid());
+        if (StringUtils.isNotBlank(query.getMenuName())){
+            qw.like("sm.name",query.getMenuName());
+        }
+        List<SysMenuRoleDataVo> sysMenuRoleDataVos = baseMapper.selMenuByRole(qw);
+        return rb.success().setData(sysMenuRoleDataVos);
+    }
+
+    public ResultBean updateDataByRoleMenu(List<SysMenuRoleDataDto> dtos) {
+        ResultBean rb = ResultBean.fireFail();
+        for (SysMenuRoleDataDto dto : dtos) {
+            if (StringUtils.isNotBlank(dto.getDataRuleId())){
+                baseMapper.updateDataByRoleMenu(dto.getSid(),dto.getDataRuleId());
+            }
+        }
+        return rb.success();
+    }
     ///----获平台角色s的某个资源的菜单树形列表（内存操作）   开始----
 
 

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationPageQuery.java

@@ -18,4 +18,6 @@ public class BillApplicationPageQuery implements Query {
     private String orgPath;
     @ApiModelProperty("1待办2已办")
     private String type;
+    @ApiModelProperty("菜单sid")
+    private String menuSid;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppFinUncollectedReceivablesDetailedsQuery.java

@@ -14,10 +14,12 @@ public class AppFinUncollectedReceivablesDetailedsQuery implements Query {
 
     @ApiModelProperty("用户sid")
     private String userSid;
-
     @ApiModelProperty("客户名称")
     private String name;
-
     @ApiModelProperty("分公司sid")
     private String useOrgSid;
+    @ApiModelProperty("组织全路径")
+    private String orgPath;
+    @ApiModelProperty("菜单sid")
+    private String menuSid;
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java

@@ -56,6 +56,7 @@ public class InvoicedService {
         finBillApplicationQuery.setName(params.getName());
         finBillApplicationQuery.setOrgPath(params.getOrgPath());
         finBillApplicationQuery.setType(params.getType());
+        finBillApplicationQuery.setMenuSid(params.getMenuSid());
         PagerQuery<FinBillApplicationQuery> pcq = new PagerQuery<>();
         pcq.setParams(finBillApplicationQuery);
         ResultBean<PagerVo<FinBillApplicationVo>> resultBean = finBillApplicationFeign.listPage(pcq);