Merge remote-tracking branch 'origin/master'

operation_manager/src/main/java/com/huaxu/task/controller/PlanManageController.java

@@ -58,13 +58,17 @@ public class PlanManageController {
         record.setPlanStartDate(DatesUtil.parseDate(planStartDate,"yyyy-MM-dd HH:mm:ss"));
         record.setPlanEndDate(DatesUtil.parseDate(planEndDate,"yyyy-MM-dd HH:mm:ss"));
         record.setUserId(userId);
-        record.setPlanUserId(loginUser.getId().toString());
         record.setTaskContent(taskContent);
         record.setTaskAreaShape(taskAreaShape);
         record.setTaskAreaName(taskAreaName);
-        record.setCreateBy(loginUser.getId().toString());
-        record.setTenantId(loginUser.getTenantId());
         record.setDateCreate(DatesUtil.parseDate(DatesUtil.formatNow(),"yyyy-MM-dd HH:mm:ss"));
+        if(loginUser.getId() != null) {
+            record.setPlanUserId(loginUser.getId().toString());
+            record.setCreateBy(loginUser.getId().toString());
+        }
+        if(loginUser.getTenantId() != null) {
+            record.setTenantId(loginUser.getTenantId());
+        }
         int rows = planManageService.insertSelective(record);
         if(rows > 0) {
             return new AjaxMessage(ResultStatus.OK);

operation_manager/src/main/java/com/huaxu/task/dto/PlanManageDto.java

@@ -12,21 +12,11 @@ import java.util.List;
 @Data
 @ApiModel("计划管理")
 public class PlanManageDto extends PlanManage {
-    /**
-     * 所属公司id
-     */
-    @ApiModelProperty(value = "所属公司id")
-    private Integer companyOrgId;
     /**
      * 所属公司名称
      */
     @ApiModelProperty(value = "所属公司名称")
     private String companyOrgName;
-    /**
-     * 所属部门id
-     */
-    @ApiModelProperty(value = "所属部门id")
-    private Integer deptOrgId;
     /**
      * 所属部门名称
      */

operation_manager/src/main/java/com/huaxu/task/entity/PlanManage.java

@@ -86,5 +86,11 @@ public class PlanManage implements Serializable {
     @ApiModelProperty(value = "更新时间")
     private Date dateUpdate;
 
+    @ApiModelProperty(value = "所属公司id")
+    private String companyOrgId;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String departmentOrgId;
+
     private static final long serialVersionUID = 1L;
 }