Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-pla...

侯瑞军

2021-03-31 90f2acaa6c61d5a60822d4fee5a44ec3c5404f67

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java

@@ -164,14 +164,14 @@
                if(doctorUserAllVo.getDepScreen()==null&&doctorUserAllVo.getDepNewScreenclient()==null){
                     state=1;
                }
                if(doctorUserAllVo.getDepScreen().equals(0)){
                if(doctorUserAllVo.getDepScreen()!=null&&doctorUserAllVo.getDepScreen()==0){
                    state=3;
                }
                if(doctorUserAllVo.getDepScreen().equals(1)){
                    if(doctorUserAllVo.getDepNewScreenclient().equals(1)){
                if(doctorUserAllVo.getDepScreen()!=null&&doctorUserAllVo.getDepScreen()==1){
                    if(doctorUserAllVo.getDepNewScreenclient()!=null&&doctorUserAllVo.getDepNewScreenclient()==1){
                        state=2;
                    }
                    if(doctorUserAllVo.getDepNewScreenclient().equals(0)){
                    if(doctorUserAllVo.getDepNewScreenclient()!=null&&doctorUserAllVo.getDepNewScreenclient()==0){
                        state=1;
                    }
                }