Merge remote-tracking branch 'origin/相关方关联分公司功能' into 相关方关联分公司功能

src/main/java/com/zcloud/controller/xgf/FlowTrainController.java

@@ -31,7 +31,6 @@ public class FlowTrainController extends BaseController {
         PageData pd = new PageData();
         pd = this.getPageData();
         pd.put("MAndTUserId",Jurisdiction.getUSER_ID());
-//        pd.put("TRAIN_CORP_LEADER", Jurisdiction.getUSER_ID());
         Map result = HttpClientService.doPost(xgfUrl + "/openApi/trainingbatch/list" +getPageUrl(page), pd);
         return result;
     }

src/main/resources/mybatis/datasource/system/UsersMapper.xml

@@ -1317,6 +1317,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		</if>
 	</select>
 	<select id="getUserInfo" resultType="com.zcloud.entity.PageData">
-		select * from vi_user_all where USER_ID = #{USER_ID}
+        select * from vi_user_all
-	</select>
+        <if test="USER_ID != null and USER_ID != ''">
+            where USER_ID = #{USER_ID}
+        </if>
+        <if test="USER_IDS != null and USER_IDS != ''">
+        	where USER_ID in
+			<foreach item="item" index="index" collection="USER_IDS" open="(" separator="," close=")">
+				#{item}
+			</foreach>
+		</if>
+    </select>
 </mapper>