소스 검색

修改添加场景部门为0的情况

wangyangyang 4 년 전
부모
커밋
ec659128ff
2개의 변경된 파일10개의 추가작업 그리고 1개의 파일을 삭제
  1. 2 1
      sms_water/src/main/java/com/huaxu/controller/SceneController.java
  2. 8 0
      sms_water/src/main/java/com/huaxu/service/SceneService.java

+ 2 - 1
sms_water/src/main/java/com/huaxu/controller/SceneController.java

@@ -6,8 +6,10 @@ import com.huaxu.common.FileUploadUtil;
 import com.huaxu.dto.DeviceDto;
 import com.huaxu.entity.SceneTypeEntity;
 import com.huaxu.model.AjaxMessage;
+import com.huaxu.model.LoginUser;
 import com.huaxu.model.Pagination;
 import com.huaxu.model.ResultStatus;
+import com.huaxu.util.UserUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -103,7 +105,6 @@ public class SceneController {
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
     public AjaxMessage<Integer> addScene(@ApiParam(value = "场景", required = true) @RequestBody SceneEntity scene) {
-
         int result = sceneService.addScene(scene) ? 1 : 0;
         return new AjaxMessage<>(ResultStatus.OK, result);
     }

+ 8 - 0
sms_water/src/main/java/com/huaxu/service/SceneService.java

@@ -155,6 +155,14 @@ public class SceneService extends ServiceImpl<SceneMapper, SceneEntity> {
         LoginUser currentUser = UserUtil.getCurrentUser();
         scene.setTenantId(currentUser.getTenantId());
         scene.setStatus(1);
+        if(currentUser!=null) {
+            scene.setCreateBy(currentUser.getName());
+            scene.setUpdateBy(currentUser.getName());
+            scene.setDateUpdate(new Date());
+            scene.setDateCreate(new Date());
+        }
+        if(scene.getDeptOrgId()!=null&&scene.getDeptOrgId()==0)
+            scene.setDeptOrgId(null);
 
         // 如果没有设置父节点,则代表为跟节点,有则获取父节点实体
         if (scene.getParentSceneId() == null || StringUtils.isBlank(scene.getParentSceneId().toString())) {