Commit 71ef46a2 authored by wzp's avatar wzp

修改bug

parent 2143a69a
...@@ -107,13 +107,18 @@ public class SystemOperationLogService extends ServiceImpl<SysLogMapper, SysLog> ...@@ -107,13 +107,18 @@ public class SystemOperationLogService extends ServiceImpl<SysLogMapper, SysLog>
} }
Object[] method_param = point.getArgs(); //获取方法参数; Object[] method_param = point.getArgs(); //获取方法参数;
if (OperModule.STBOPERATION.getMsg().equals(methodLog.operModule().getMsg())) { if (OperModule.STBOPERATION.getMsg().equals(methodLog.operModule().getMsg())) {
TBoxOperation t = (TBoxOperation) method_param[0];
TOperationLog operationLog = new TOperationLog(); TOperationLog operationLog = new TOperationLog();
operationLog.setCreateTime(LocalDateTime.now()); operationLog.setCreateTime(LocalDateTime.now());
operationLog.setUserId(user.getId()); operationLog.setUserId(user.getId());
if (user.getAreaName() != null) { if (user.getAreaName() != null) {
operationLog.setArea(user.getAreaName()); operationLog.setArea(user.getAreaName());
} }
if (OperType.ACTIVATION.getMsg().equals(methodLog.operType().getMsg())&&"3".equals(t.getStatus())){
operationLog.setOperationType(OperType.FAULT.getMsg());
}else {
operationLog.setOperationType(methodLog.operType().getMsg()); operationLog.setOperationType(methodLog.operType().getMsg());
}
operationLogService.save(operationLog); operationLogService.save(operationLog);
return method_param; return method_param;
} }
......
...@@ -123,6 +123,9 @@ public class TOrganController extends BaseController { ...@@ -123,6 +123,9 @@ public class TOrganController extends BaseController {
if (!byId.getParentId().equals(tOrgan.getParentId())) { if (!byId.getParentId().equals(tOrgan.getParentId())) {
tOrgan.setCode(getOrganCode(tOrgan.getParentId())); tOrgan.setCode(getOrganCode(tOrgan.getParentId()));
} }
}else {
tOrgan.setParentId("0");
tOrgan.setCode(getOrganCode(tOrgan.getParentId()));
} }
if (StringUtils.isNotBlank(tOrgan.getCode())) { if (StringUtils.isNotBlank(tOrgan.getCode())) {
if (byId.getChildren().size() > 0) { if (byId.getChildren().size() > 0) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment