Merge branch 'dev' of http://111.203.232.171:8888/lee/chnmuseum-party into dev

src/main/java/cn/chnmuseum/party/common/log/SystemOperationLogService.java

@@ -107,13 +107,18 @@ public class SystemOperationLogService extends ServiceImpl<SysLogMapper, SysLog>
         }
         Object[] method_param = point.getArgs(); //获取方法参数;
         if (OperModule.STBOPERATION.getMsg().equals(methodLog.operModule().getMsg())) {
+            TBoxOperation t = (TBoxOperation) method_param[0];
             TOperationLog operationLog = new TOperationLog();
             operationLog.setCreateTime(LocalDateTime.now());
             operationLog.setUserId(user.getId());
             if (user.getAreaName() != null) {
                 operationLog.setArea(user.getAreaName());
             }
-            operationLog.setOperationType(methodLog.operType().getMsg());
+            if (OperType.ACTIVATION.getMsg().equals(methodLog.operType().getMsg())&&3==(t.getStatus())){
+                    operationLog.setOperationType(OperType.FAULT.getMsg());
+            }else {
+                operationLog.setOperationType(OperType.ACTIVATION.getMsg());
+            }
             operationLogService.save(operationLog);
             return method_param;
         }

src/main/java/cn/chnmuseum/party/web/controller/TOrganController.java

@@ -123,6 +123,9 @@ public class TOrganController extends BaseController {
                 if (!byId.getParentId().equals(tOrgan.getParentId())) {
                     tOrgan.setCode(getOrganCode(tOrgan.getParentId()));
                 }
+            }else {
+                tOrgan.setParentId("0");
+                tOrgan.setCode(getOrganCode(tOrgan.getParentId()));
             }
             if (StringUtils.isNotBlank(tOrgan.getCode())) {
                 if (byId.getChildren().size() > 0) {