From 6d0fee3cdc8cb213d0388ffa2e7ed7a091a1ea4c Mon Sep 17 00:00:00 2001
From: dougang <78125310@kidgrow.com>
Date: Thu, 08 Apr 2021 13:58:41 +0800
Subject: [PATCH] 咨询小程序相关功能

---
 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java |   34 ++++++++++++++++++++++++++++++++--
 1 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
index 1fbec45..3513273 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
@@ -156,9 +156,35 @@
             //医院信息
             DoctorUserAll doctorUserAllVo = baseMapper.findDoctorUserAllData(sysUser.getId());
             if (doctorUserAllVo != null) {
-                loginAppUser.setDoctorUserAllVO(doctorUserAllVo);
+
                 //是否医院管理员
                 loginAppUser.setHAdminUser(doctorUserAllVo.getIsAdminUser());
+                //1表示调用老系统接口,2表示调用新系统接口,3表示不执行接口调用
+                byte state=0;
+                if(doctorUserAllVo.getDepScreen()==null&&doctorUserAllVo.getDepNewScreenclient()==null){
+                     state=1;
+                }
+                if(doctorUserAllVo.getDepScreen()!=null&&doctorUserAllVo.getDepScreen()==0){
+                    state=3;
+                }
+                if(doctorUserAllVo.getDepScreen()!=null&&doctorUserAllVo.getDepScreen()==1){
+                    if(doctorUserAllVo.getDepNewScreenclient()!=null&&doctorUserAllVo.getDepNewScreenclient()==1){
+                        state=2;
+                    }
+                    if(doctorUserAllVo.getDepNewScreenclient()!=null&&doctorUserAllVo.getDepNewScreenclient()==0){
+                        state=1;
+                    }
+                }
+                doctorUserAllVo.setInterfaceState(state);
+                loginAppUser.setDoctorUserAllVO(doctorUserAllVo);
+//                1、is_screen为空时,is_new_screenclient必须为空;
+//                2、is_screen不为空时,is_new_screenclient可为空,可不为空;
+//                3、当两个都为空时,默认调用老系统的接口;
+//                4、当is_screen为false时,不论is_new_screenclient是什么不需要调用任何接口;
+//                5、当is_screen为true时,is_new_screenclient为false或空时,调用老系统的接口;
+//                6、当is_screen为true时,is_new_screenclient为true时,调用新系统的接口;
+
+
             }
         }
         return loginAppUser;
@@ -798,7 +824,11 @@
             sysUser.setType(UserType.DOCTOR.name());
         }
         sysUser.setHAdminUser(false);
-        sysUser.setDefaultAuth(false);
+        if(isReg){
+            sysUser.setDefaultAuth(false);
+        }else{
+            sysUser.setDefaultAuth(true);
+        }
         sysUser.setOpenId(userRegVo.getOpenId());
         sysUser.setDel(false);
         sysUser.setTenantId(CommonConstant.H_TENANT);

--
Gitblit v1.8.0