浏览代码

财务列表只能 技术/财务部门看见全部,其他部门只能看到自己相关的

wangxiaoming 5 年之前
父节点
当前提交
f6eea1bc7a

+ 11 - 0
watero-rst-core/src/main/java/com.iamberry.rst.core/dm/FinancialReceipt.java

@@ -45,6 +45,9 @@ public class FinancialReceipt  implements  Serializable{
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date createDate;
 
+    //客户跟进管理id
+    private Integer dealerAdminId;
+
     public Integer getFrId(){
         return frId;
     }
@@ -148,4 +151,12 @@ public class FinancialReceipt  implements  Serializable{
     public void setDealerName(String dealerName) {
         this.dealerName = dealerName;
     }
+
+    public Integer getDealerAdminId() {
+        return dealerAdminId;
+    }
+
+    public void setDealerAdminId(Integer dealerAdminId) {
+        this.dealerAdminId = dealerAdminId;
+    }
 }

+ 4 - 0
watero-rst-service/src/main/java/com/iamberry/rst/service/dm/mapper/financialReceiptMapper.xml

@@ -36,6 +36,7 @@
         from tb_rst_dm_financial_receipt t
         LEFT JOIN tb_rst_sys_admin sa ON  t.fr_claim_admin_id = sa.admin_id
         LEFT JOIN tb_rst_dm_dealer dd ON  t.dealer_id = dd.dealer_id
+        LEFT JOIN tb_rst_sys_admin sa2 ON  dd.create_id = sa2.admin_id
         <where>
             <if test="frId != null ">
                 AND t.fr_id = #{frId}
@@ -67,6 +68,9 @@
             <if test="frClaimAdminName != null and frClaimAdminName != ''">
                 AND  sa.admin_name  like  CONCAT ('%',#{frClaimAdminName},'%')
             </if >
+            <if test="dealerAdminId != null ">
+                AND (t.fr_claim_status = 2 OR  dd.create_id = #{dealerAdminId})
+            </if >
         </where>
         ORDER BY t.fr_id DESC
     </select>

+ 7 - 0
watero-rst-web/src/main/java/com/iamberry/rst/controllers/dm/FinanciaReceController.java

@@ -77,6 +77,13 @@ public class FinanciaReceController {
         Admin admin = AdminUtils.getLoginAdmin();
         mv.addObject("admin",admin);
 
+
+        if(admin.getAdminDept() != 1 && admin.getAdminDept() != 5){
+            //获取登录员工id
+            Integer adminId = AdminUtils.getLoginAdminId();
+            financialReceipt.setDealerAdminId(adminId);
+        }
+
         // 封装请求数据
         PageRequest<FinancialReceipt> pageRequest = new PageRequest<>(financialReceipt, pageNO, pageSize, totalNum == 0);
         // 查询订单列表

+ 1 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/home/pc_index.ftl

@@ -38,7 +38,7 @@
 <header class="navbar-wrapper">
     <input type="hidden" id="parent_is_login" value="1" placeholder="用于判断是否存在父级页面!">
     <div class="navbar navbar-fixed-top">
-        <div class="container-fluid cl"><a class="logo navbar-logo hidden-xs" href="#"><img src="/common/images/index/admin-login.png" style="height: 40px;"></a><a class="logo navbar-logo-m f-l mr-10 visible-xs" href="#">Watero-RST</a>
+        <div class="container-fluid cl"><a class="logo navbar-logo hidden-xs" href="#"><img src="${path}/common/images/index/admin-login.png" style="height: 40px;"></a><a class="logo navbar-logo-m f-l mr-10 visible-xs" href="#">Watero-RST</a>
             <span class="logo navbar-slogan f-l mr-10 hidden-xs"></span>
             <a aria-hidden="false" class="nav-toggle Hui-iconfont visible-xs" href="javascript:;">&#xe667;</a>
             <nav id="Hui-userbar" class="nav navbar-nav navbar-userbar hidden-xs">