123

ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml

@@ -195,7 +195,7 @@
         ) r ON l.id = r.user_id
         LEFT JOIN app_user_login pl ON r.parent_id = pl.id
         LEFT JOIN app_user_detail pd ON pl.id = pd.userid
-        LEFT JOIN xxfc_app.app_version_mark z ON z.mark = d.register_source
+        LEFT JOIN chw_app.app_version_mark z ON z.mark = d.register_source
         WHERE
         l.isdel = 0
         and

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml

@@ -1345,10 +1345,16 @@
                             </foreach>
                         </when>
                         <when test="type !=null and type == 3">
-                            and bc2.id in
+                            and (
+                            bc2.id in
                             <foreach collection="dataCompanyIds" item="id" open="(" separator="," close=")">
                                 #{id}
                             </foreach>
+                            and  v.subordinate_branch not in
+                            <foreach collection="dataCompanyIds" item="id" open="(" separator="," close=")">
+                                #{id}
+                            </foreach>
+                            )
                         </when>
                         <otherwise>
                             and (bc.id in