Merge remote-tracking branch 'origin/master'
| | |
| | | password: nacos |
| | | discovery: |
| | | server-addr: http://175.27.187.84:8848 #配置Nacos地址 |
| | | namespace: dev_renkang |
| | | namespace: dmvisit |
| | | # namespace: dev_renkang |
| | | username: nacos |
| | | password: nacos |
| | | gateway: |
| | |
| | | # data-id: com.doumee.meeting.admin |
| | | discovery: |
| | | server-addr: http://175.27.187.84:8848 #配置Nacos地址 |
| | | namespace: dev_renkang |
| | | namespace: dmvisit |
| | | username: nacos |
| | | password: nacos |
| | | # swagger配置 |
| | |
| | | ,Constants.MultiFile.HIDDEN_DANGER_DEAL_AFTER.getKey()})) |
| | | .eq(Multifile::getIsdeleted,Constants.ZERO)); |
| | | if(multifiles!=null){ |
| | | String path = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode() |
| | | +systemDictDataBiz.queryByCode(Constants.OSS,Constants.HIDDEN_DANGER_FILE).getCode(); |
| | | String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() |
| | | +systemDictDataBiz.queryByCode(Constants.FTP,Constants.HIDDEN_DANGER_FILE).getCode(); |
| | | for(Multifile f : multifiles){ |
| | | if(StringUtils.isBlank(f.getFileurl())){ |
| | | continue; |
| | |
| | | user.setSalt(salt); |
| | | // 创建用户记录 |
| | | user.setType(insert.getType()); |
| | | user.setAvatar(insert.getFaceImg()); |
| | | user.setUsername(insert.getPhone()); |
| | | user.setEmpNo(insert.getCode()); |
| | | user.setRealname(insert.getName()); |
| | |
| | | member.setHkOrgId(company.getHkId()); |
| | | isNeedUpdateUser = true; |
| | | } |
| | | if(StringUtils.isNotBlank(model.getFaceImg())){ |
| | | isNeedUpdateUser=true; |
| | | } |
| | | if(isNeedUpdateUser){ |
| | | //更新系统用户账号信息 |
| | | systemUserMapper.update(null,new UpdateWrapper<SystemUser>().lambda() |
| | | .set(SystemUser::getUpdateUser,member.getLoginUserInfo().getId()) |
| | | .set(SystemUser::getUpdateTime,new Date()) |
| | | .set(StringUtils.isNotBlank(model.getFaceImg()),SystemUser::getAvatar,member.getFaceImg()) |
| | | .set(StringUtils.isNotBlank(model.getPhone()),SystemUser::getMobile,member.getPhone()) |
| | | .set(StringUtils.isNotBlank(model.getName()),SystemUser::getRealname,member.getName()) |
| | | .set(model.getCompanyId() !=null,SystemUser::getCompanyId,member.getCompanyId()) |