Merge branch 'dev1.1' into dev

zhaoxiaohao

2021-03-01 7ea2a2cfe922c9b2d5c09c737d10a7f1ab5b50d1

 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().equals(0)){
                    state=3;
                }
                if(doctorUserAllVo.getDepScreen().equals(1)){
                    if(doctorUserAllVo.getDepNewScreenclient().equals(1)){
                        state=2;
                    }
                    if(doctorUserAllVo.getDepNewScreenclient().equals(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;