diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/controller/OrgApplyInfoController.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/controller/OrgApplyInfoController.java index 2c11672..7bac920 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/controller/OrgApplyInfoController.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/controller/OrgApplyInfoController.java @@ -137,7 +137,17 @@ public class OrgApplyInfoController extends JeecgController edit(@RequestBody OrgApplyInfo orgApplyInfo) { orgApplyInfoService.audit(orgApplyInfo); - return Result.OK("保存成功!"); + return Result.OK("审核完成!"); + } + + + @AutoLog(value = "上传合同-保存为草稿") + @ApiOperation(value = "上传合同-保存为草稿", notes = "上传合同-保存为草稿") + @RequiresPermissions("orgapplyinfo:nu_org_apply_info:edit") + @RequestMapping(value = "/editCg", method = {RequestMethod.PUT, RequestMethod.POST}) + public Result editCg(@RequestBody OrgApplyInfo orgApplyInfo) { + orgApplyInfoService.audit(orgApplyInfo); + return Result.OK("操作完成!"); } /** diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgApplyInfo.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgApplyInfo.java index babdaa4..8965de3 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgApplyInfo.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgApplyInfo.java @@ -235,6 +235,7 @@ public class OrgApplyInfo implements Serializable { @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "审核时间") private java.util.Date auditTime; + private String auditBy; /**加盟时间*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/service/impl/OrgApplyInfoServiceImpl.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/service/impl/OrgApplyInfoServiceImpl.java index 2f10fb6..8678744 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/service/impl/OrgApplyInfoServiceImpl.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/service/impl/OrgApplyInfoServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.json.JSONObject; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.nu.dto.OrgApplyInfoMQDto; @@ -181,9 +182,11 @@ public class OrgApplyInfoServiceImpl extends ServiceImpl updateWrapper = new UpdateWrapper<>(); + updateWrapper.set("content",null); + updateWrapper.eq("id", orgApplyInfo.getId()); + update(updateWrapper); + } } } @@ -317,6 +328,9 @@ public class OrgApplyInfoServiceImpl extends ServiceImpl randomInputCode(HttpServletResponse response,@PathVariable("key") String key){ + Result res = new Result(); + try { + //生成验证码 + String code = RandomUtil.randomString(BASE_CHECK_CODES,4); + //存到redis中 + String lowerCaseCode = code.toLowerCase(); + + //update-begin-author:taoyan date:2022-9-13 for: VUEN-2245 【漏洞】发现新漏洞待处理20220906 + // 加入密钥作为混淆,避免简单的拼接,被外部利用,用户自定义该密钥即可 + String origin = lowerCaseCode+key+jeecgBaseConfig.getSignatureSecret(); + String realKey = Md5Util.md5Encode(origin, "utf-8"); + //update-end-author:taoyan date:2022-9-13 for: VUEN-2245 【漏洞】发现新漏洞待处理20220906 + + redisUtil.set(realKey, lowerCaseCode, 60); + log.info("获取验证码,Redis key = {},checkCode = {}", realKey, code); + res.setSuccess(true); + res.setResult(code); + } catch (Exception e) { + log.error(e.getMessage(), e); + res.error500("获取验证码失败,请检查redis配置!"); + return res; + } + return res; + } + /** * 切换菜单表为vue3的表 */ diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java index ef9b8d2..d165102 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java @@ -1950,7 +1950,7 @@ public class SysUserController { orgApplyInfo.setBuildStatus("5"); orgApplyInfoService.updateById(orgApplyInfo); - result.success("添加成功!"); + result.success("初始化成功!账号:" + jsonObject.getString("userName") + " 密码:123456"); } catch (Exception e) { log.error(e.getMessage(), e); result.error500("操作失败");