From 59d2d9fbd2dd962b1cf47173ce3025536bef9270 Mon Sep 17 00:00:00 2001
From: xiaoCJ <406612557@qq.com>
Date: Fri, 19 Jul 2024 09:36:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=80=81=E5=B8=88=E7=AB=AF?=
 =?UTF-8?q?=E5=8D=95=E7=82=B9=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/tea/UserController.java                | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/sztzjy/financial_bigdata/controller/tea/UserController.java b/src/main/java/com/sztzjy/financial_bigdata/controller/tea/UserController.java
index 77b280a..063ced5 100644
--- a/src/main/java/com/sztzjy/financial_bigdata/controller/tea/UserController.java
+++ b/src/main/java/com/sztzjy/financial_bigdata/controller/tea/UserController.java
@@ -95,6 +95,7 @@ public class UserController {
     @AnonymousAccess
     public ResultEntity login(@RequestParam(required = false) String passwordEncode,
                               @RequestParam(required = false) String userName,
+                              @ApiParam("所属系统")@RequestParam String systemOwner,
                               HttpServletRequest request,
                               @RequestParam(required = false) String TOKEN) {
         JwtUser jwtUser;
@@ -115,7 +116,7 @@ public class UserController {
 
             // 1、子系统直接登录
             StuUserExample stuUserExample = new StuUserExample();
-            stuUserExample.createCriteria().andUsernameEqualTo(userName).andPasswordEqualTo(passWord);
+            stuUserExample.createCriteria().andSystemOnwerEqualTo(systemOwner).andUsernameEqualTo(userName).andPasswordEqualTo(passWord);
             List<StuUser> stuUsers = stuUserMapper.selectByExample(stuUserExample);
             //不存在返回错误，正确放行
             if (stuUsers.isEmpty()) {
@@ -214,7 +215,8 @@ public class UserController {
     @ApiOperation("根据用户Code查询该用户是否存在个人赛用户数据，存在则返回，不存在则新增后返回，用于智云3.0创建用户后调用该接口创建用户个人赛")
     @PostMapping("/checkOrCreateForexSimulationUser")
     @AnonymousAccess
-    public String checkOrCreateForexSimulationUser(@RequestBody List<ZYUserInfo> zyUserInfoList) {
+    public String checkOrCreateForexSimulationUser(@RequestBody List<ZYUserInfo> zyUserInfoList,
+                                                   @RequestParam String systemOwner) {
         List<StuUser> users = new ArrayList<>();
         Map<String, StuClass> map = new HashMap<>();
         for (int i = 0; i < zyUserInfoList.size(); i++) {
@@ -241,6 +243,11 @@ public class UserController {
             stuUser.setRoleId(roleId);
             stuUser.setSchoolId(zyUserInfo.getSchoolId().toString());
             stuUser.setSchoolName(zyUserInfo.getSchoolName());
+
+            //新增两个参数
+            stuUser.setSystemOnwer(systemOwner);
+            stuUser.setZyUserid(zyUserInfo.getUserId());
+
             stuUser.setStatus(0);
             stuUser.setCreateTime(new Date());
             users.add(stuUser);