Преглед изворни кода

财务菜单进入或后线角色可查看费用信息

cuixinpeng пре 2 година
родитељ
комит
12ce81ed3b

+ 1 - 2
src/main/java/com/ydtech/modules/fnc/controller/CarSettleController.java

@@ -77,8 +77,7 @@ public class CarSettleController extends BaseController {
                 .eq(StringUtils.isNotEmpty(orderNo),"orderno",orderNo)
                 .eq("orderstatus","3").list();//3已承保
         if(areaList!=null && areaList.size()>0){
-            String userId = getUserId();
-            return insOrdersService.getByCompanyId(areaList.get(0).getId(),userId);
+            return insOrdersService.getByCompanyId(areaList.get(0).getId(),"accountingUser");
         }else{
             return HttpResult.error("订单号有误-未承保");
         }

+ 13 - 3
src/main/java/com/ydtech/modules/order/service/impl/InsOrdersServiceImpl.java

@@ -349,9 +349,19 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         //新增费用明细信息
         QueryOrderFeeVo queryOrderFeeVo = feeRuleSchemeService.queryFeeOrderInfo(companyId);
         orderAndAreaCompany.setOrderCommissionVo(queryOrderFeeVo.getOrderCommissionVo());
-        //判断当前登录人员是否为后线人员,来决定是否返回总费用详情信息
-        List<SysUser> userList = sysUserService.findAllAgentRoleUser(userId,"22");
-        if(userList!=null && userList.size()>0){
+
+        boolean isShowOrderFee = false;
+        //如果是财务菜单进入的,不再进行权限控制,所有都可查看
+        if("accountingUser".equals(userId)){
+            isShowOrderFee = true;
+        }else {
+            //判断当前登录人员是否为后线人员,来决定是否返回总费用详情信息
+            List<SysUser> userList = sysUserService.findAllAgentRoleUser(userId,"22");
+            if(userList!=null && userList.size()>0){
+                isShowOrderFee = true;
+            }
+        }
+        if(isShowOrderFee){
             List<QueryOrderFeeResultVo> orderFeeVoList = feeRuleSchemeService.convertOrderFeeVoData(queryOrderFeeVo);
             if (!orderFeeVoList.isEmpty()) {
                 orderAndAreaCompany.setOrderFeeResult(orderFeeVoList);