From 9694328db15162428b57a54d17dd9e503db96910 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 31 十月 2023 10:01:02 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/cstmr/cstmr.js  |    4 ++--
 src/main/resources/mapper/CstmrMapper.xml |    2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mapper/CstmrMapper.xml b/src/main/resources/mapper/CstmrMapper.xml
index 5d6d2ef..2d22e4c 100644
--- a/src/main/resources/mapper/CstmrMapper.xml
+++ b/src/main/resources/mapper/CstmrMapper.xml
@@ -262,8 +262,6 @@
             <otherwise>
                 and
                 (
-                user_id = #{userId}
-                or
                 director = #{userId}
                 or
                 mc.id in
diff --git a/src/main/webapp/static/js/cstmr/cstmr.js b/src/main/webapp/static/js/cstmr/cstmr.js
index 0537c31..8813cab 100644
--- a/src/main/webapp/static/js/cstmr/cstmr.js
+++ b/src/main/webapp/static/js/cstmr/cstmr.js
@@ -151,7 +151,6 @@
             ,{field: 'industry', align: 'left',title: '瀹㈡埛琛屼笟', hide: false}
             ,{field: 'productCategory', align: 'left',title: '浜у搧绫诲埆', hide: false}
             ,{field: 'userId$', align: 'left',title: '娣诲姞浜哄憳', hide: true}
-            ,{field: 'createTime$', align: 'left',title: '娣诲姞鏃堕棿', hide: false}
             ,{field: 'deptId$', align: 'left',title: '鎵�灞為儴闂�', hide: true}
             ,{field: 'rela', align: 'left',title: '瀹㈡埛鍏崇郴', hide: true}
             ,{field: 'contacts', align: 'left',title: '瀹㈡埛鑱旂郴浜�', hide: true}
@@ -164,8 +163,9 @@
             ,{field: 'files', align: 'left',title: '闄勪欢', hide: true}
             ,{field: 'status$', align: 'left',title: '鐘舵��', hide: true}
             // ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳', hide: true}
-            ,{field: 'updateBy$', align: 'left',title: '淇敼浜哄憳', hide: true}
+            ,{field: 'updateBy$', align: 'left',title: '娣诲姞浜哄憳', hide: false}
             ,{field: 'updateTime$', align: 'left',title: '淇敼鏃堕棿', hide: true}
+            ,{field: 'createTime$', align: 'left',title: '娣诲姞鏃堕棿', hide: false}
             ,{field: 'memo', align: 'left',title: '娉ㄩ噴', hide: true}
 
             ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}

--
Gitblit v1.9.1