Browse Source

Merge remote-tracking branch 'origin/test' into test

zhaoxian 2 years ago
parent
commit
3019511564
1 changed files with 7 additions and 4 deletions
  1. 7 4
      ruixuan-live/src/main/resources/mapper/isc/SupplyChainMapper.xml

+ 7 - 4
ruixuan-live/src/main/resources/mapper/isc/SupplyChainMapper.xml

@@ -647,13 +647,16 @@
                  left join sys_user_role t2 on t1.role_id = t2.role_id
                  left join sys_user t3 on t2.user_id = t3.user_id
         where t1.role_key in (
-                              'supplyChain',
-                              'commodityManagement',
-                              'supplyChainAdmin'
+                              'supplyChainAdmin',
+                              'associationManager',
+                              'bd',
+                              'bdManager',
+                              'association',
+                              'courtshipManager',
+                              'courtship'
             )
         group by t3.user_id
         order by t3.create_time asc
-
     </select>
     <select id="adminReportList" resultType="com.alibaba.fastjson.JSONObject">
         select *