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

houruijun

2020-11-04 1e228c1191996a8e704cf36dc8042b1c6ca81ef1

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserOrgController.java

@@ -6,6 +6,8 @@
import com.kidgrow.common.model.SysOrganization;
import com.kidgrow.common.model.SysUser;
import com.kidgrow.common.model.SysUserOrg;
import com.kidgrow.redis.util.RedisConstant;
import com.kidgrow.redis.util.RedisUtils;
import com.kidgrow.usercenter.model.SysDepartment;
import com.kidgrow.usercenter.model.SysHospital;
import com.kidgrow.usercenter.service.ISysOrganizationService;
@@ -38,6 +40,8 @@
    private SysDepartmentServiceImpl sysDepartmentService;
    @Autowired
    private SysHospitalServiceImpl sysHospitalService;
    @Autowired
    private RedisUtils redisUtils;

    @PostMapping("getListByMap")
    public List<SysUserOrg> getListByMap(@RequestParam Map<String, Object> map) {
@@ -97,7 +101,7 @@

                                //查询  科室
                                QueryWrapper queryWrapper = new QueryWrapper();
                                queryWrapper.eq("org_id", sysUserOrg.getUpdateUserId());
                                queryWrapper.eq("org_id", sysUserOrg.getOrgId());
                                queryWrapper.eq("is_del", 0);
                                queryWrapper.eq("enabled", 1);
                                List<SysDepartment> list = sysDepartmentService.list(queryWrapper);
@@ -136,7 +140,7 @@

                            //查询  科室
                            QueryWrapper queryWrapper = new QueryWrapper();
                            queryWrapper.eq("org_id", sysUserOrg.getUpdateUserId());
                            queryWrapper.eq("org_id", sysUserOrg.getOrgId());
                            queryWrapper.eq("is_del", 0);
                            queryWrapper.eq("enabled", 1);
                            List<SysDepartment> list = sysDepartmentService.list(queryWrapper);
@@ -151,9 +155,9 @@
                            queryWrapper.eq("enabled", 1);
                            List<SysHospital> listHospital = sysHospitalService.list(queryWrapper);
                            if (!listHospital.isEmpty()) {
                                sysUserOrgTemp.setFromId(listHospital.get(0).getId());
                                sysUserOrg.setFromId(listHospital.get(0).getId());
                            }
                            sysUserOrgTemp.setFromLevel(1);
                            sysUserOrg.setFromLevel(1);
//                            sysUserOrg.setUpdateUserId(0L);
                            sysUserOrg.setOrgId(sysOrganization.getOrgParentId());
                            sysUserOrg.setCreateUserOrgCode(createUserOrgCode);
@@ -164,6 +168,7 @@
                    }
                    //查询
                    boolean v = sysUserOrgService.saveOrUpdateBatch(userOrgList);
                    redisUtils.hset(RedisConstant.USER_ORGANIZATION,sysUserOrg.getUserId().toString(), userOrgList);
                    if (v) {
                        return ResultBody.ok().data(sysUserOrg).msg("保存成功");
                    } else {