diff --git a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesapply/entity/EmployeesApply.java b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesapply/entity/EmployeesApply.java index 79fcfd01..fa408f59 100644 --- a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesapply/entity/EmployeesApply.java +++ b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesapply/entity/EmployeesApply.java @@ -195,6 +195,7 @@ public class EmployeesApply implements Serializable { @ApiModelProperty(value = "修改状态") private java.lang.String modifyStatus; private java.lang.String headPath; + private java.lang.String optType; /** * 审批字符串 有值时说明是走的审批 diff --git a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/controller/NuBaseInfoController.java b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/controller/NuBaseInfoController.java index 0866db34..9a649064 100644 --- a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/controller/NuBaseInfoController.java +++ b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/controller/NuBaseInfoController.java @@ -12,12 +12,14 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; +import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryRuleEnum; +import org.jeecg.common.system.vo.LoginUser; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -139,6 +141,9 @@ public class NuBaseInfoController extends JeecgController add(@RequestBody NuBaseInfo nuBaseInfo) { + + LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + nuBaseInfo.setOrgCode(loginUser.getOrgCode()); service.setNuId(nuBaseInfo); nuBaseInfoService.save(nuBaseInfo); diff --git a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/entity/NuBaseInfo.java b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/entity/NuBaseInfo.java index 8aea864e..1bf327a0 100644 --- a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/entity/NuBaseInfo.java +++ b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/entity/NuBaseInfo.java @@ -145,6 +145,7 @@ public class NuBaseInfo implements Serializable { * 是否绑定护理单元支付中 Y支付中(有客户正在给护理单元充值) N没有人在绑定缴费(可以让用户绑定) */ private String izBindPaying; + private String orgCode; @TableField(exist = false) private String deviceId;//摄像头 ID @@ -162,8 +163,6 @@ public class NuBaseInfo implements Serializable { - @TableField(exist = false) - private String orgCode; @TableField(exist = false) private String asyncId; @TableField(exist = false)