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

zhaoxiaohao

2020-06-16 79b627f05eb431de8a5c9c0f58c44213a6a55370

Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev


 Conflicts:

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

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

@@ -19,9 +19,7 @@
import com.kidgrow.redis.util.RedisUtils;
import com.kidgrow.sms.feign.SmsChuangLanService;
import com.kidgrow.sms.model.ConstantSMS;
import com.kidgrow.usercenter.mapper.SysDoctorMapper;
import com.kidgrow.usercenter.mapper.SysRoleMenuMapper;
import com.kidgrow.usercenter.mapper.SysUserMapper;
import com.kidgrow.usercenter.mapper.*;
import com.kidgrow.usercenter.model.SysDoctor;
import com.kidgrow.usercenter.model.*;
import com.kidgrow.usercenter.service.*;
@@ -81,6 +79,13 @@
    private DistributedLock lock;
    @Autowired
    private SysDoctorMapper sysDoctorMapper;

    @Autowired
    private SysRoleMapper sysRoleMapper;
    @Autowired
    private SysUserRoleMapper sysUserRoleMapper;

    private final String HOSPITAL_ADMIN="hospital_admin";

    @Override
    public LoginAppUser findByUsername(String username) {
@@ -622,6 +627,8 @@
            sysOrganizationHos.setOrgAttr(1);
            sysOrganizationHos.setOrgLevel(1);
            sysOrganizationHos.setOrgName(userRegVo.getHospitalName());
            sysOrganizationHos.setCreateUserName("自主注册");
            sysOrganizationHos.setCreateUserId(0L);
            sysOrganizationList.add(sysOrganizationHos);

            //添加科室组织数据
@@ -629,6 +636,8 @@
            sysOrganizationDe.setOrgAttr(2);
            sysOrganizationDe.setOrgLevel(2);
            sysOrganizationDe.setOrgName(userRegVo.getDepartmentName());
            sysOrganizationDe.setCreateUserName("自主注册");
            sysOrganizationDe.setCreateUserId(0L);
            sysOrganizationList.add(sysOrganizationDe);
            //批量写入
            boolean orgRe= organizationService.saveBatch(sysOrganizationList);
@@ -655,6 +664,7 @@
                    sysDepartment.setSaleUserTel("0");
                    sysDepartment.setServerUserId(0L);
                    sysDepartment.setServerUserTel("0");
                    sysDepartment.setServerUserName("自主注册");
                    boolean d=departmentService.save(sysDepartment);
                    if (!d) {
                        return ResultBody.failed("科室数据写入失败");
@@ -706,6 +716,20 @@
        boolean u=this.save(sysUser);
        if(u)
        {
            //保存  角色信息
            Map<String,Object> map= new HashMap<>();
            map.put("code",HOSPITAL_ADMIN);
            map.put("enabled",1);
            map.put("is_del",0);
            List<SysRole> sysRoles = sysRoleMapper.selectByMap(map);
            if(sysRoles.size()>0){
                //保存一个角色
                SysRole sysRole = sysRoles.get(0);
                SysRoleUser sysRoleUser=new SysRoleUser();
                sysRoleUser.setRoleId(sysRole.getId());
                sysRoleUser.setUserId(sysUser.getId());
                int insert = sysUserRoleMapper.insert(sysRoleUser);
            }
            //写入职务数据
            if (StringUtils.isNotBlank(userRegVo.getDoctorRank())) {
                //检查医生职务是否存在
@@ -755,7 +779,8 @@
            sysDoctor.setServerUserName("自主注册");
            if (sysDoctorMapper.insert(sysDoctor)==1) {
                sysUser.setPassword(userRegVo.getPassword());
                return ResultBody.ok(200,"注册成功").data(sysUser);
                return ResultBody.ok().data(sysUser);
//                return ResultBody.ok(200,"注册成功").data(sysUser);
            }
            else
            {