5-28 fix

web-app/src/main/java/com/zcloud/safetyDutyList/command/query/tasklist/TaskListQueryExe.java

@@ -4,6 +4,9 @@ import cn.hutool.core.collection.CollUtil;
 import com.alibaba.cola.dto.MultiResponse;
 import com.alibaba.cola.dto.PageResponse;
 import com.alibaba.cola.dto.SingleResponse;
+import com.alibaba.cola.exception.BizException;
+import com.jjb.saas.framework.auth.model.SSOUser;
+import com.jjb.saas.framework.auth.utils.AuthContext;
 import com.zcloud.gbscommon.utils.PageQueryHelper;
 import com.zcloud.safetyDutyList.command.convertor.tasklist.TaskListCoConvertor;
 import com.zcloud.safetyDutyList.domain.enums.*;
@@ -48,6 +51,16 @@ public class TaskListQueryExe {
      * 反馈状态推导规则：若该清单下任一任务的feedback_status=2（异常），则清单反馈状态为异常(2)；否则为正常(1)
      */
     public PageResponse<TaskListCO> listPage(TaskListPageQry qry) {
+
+        if (qry.getExecuteCorpId() == null) {
+            SSOUser ssoUser = AuthContext.getCurrentUser();
+            if (ssoUser == null) {
+                throw new BizException("请先未登录");
+            }
+            // 获取当前登录用户所属公司ID
+            qry.setExecuteCorpId(ssoUser.getTenantId());
+        }
+
         Map<String, Object> params = PageQueryHelper.toHashMap(qry);
         PageResponse<TaskListDO> pageResponse = taskListRepository.listPage(params);
         List<TaskListCO> coList = taskListCoConvertor.converDOsToCOs(pageResponse.getData());

web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/FeedbackAddExe.java

@@ -1,6 +1,8 @@
 package com.zcloud.safetyDutyList.command.tasklist;
 
 import com.alibaba.cola.exception.BizException;
+import com.jjb.saas.framework.auth.model.SSOUser;
+import com.jjb.saas.framework.auth.utils.AuthContext;
 import com.zcloud.safetyDutyList.domain.gateway.tasklist.FeedbackGateway;
 import com.zcloud.safetyDutyList.domain.gateway.tasklist.TaskDetailGateway;
 import com.zcloud.safetyDutyList.domain.gateway.tasklist.TaskListGateway;
@@ -35,6 +37,11 @@ public class FeedbackAddExe {
 
     public FeedbackCO execute(FeedbackAddCmd cmd) {
 
+        SSOUser ssoUser = AuthContext.getCurrentUser();
+        if (ssoUser == null) {
+            throw new BizException("用户未登录");
+        }
+
         TaskDetailE detailE = taskDetailGateway.getByTaskDetailId(cmd.getTaskDetailId());
         if (detailE == null) {
             throw new BizException("任务不存在");
@@ -54,6 +61,11 @@ public class FeedbackAddExe {
         } else {
             feedbackE.init();
         }
+
+        feedbackE.setFeedbackCorpId(ssoUser.getTenantId());
+        feedbackE.setFeedbackDepartmentId(ssoUser.getOrgId());
+        feedbackE.setFeedbackUserId(ssoUser.getUserId());
+
         LocalDateTime now = LocalDateTime.now();
         String periodFlag = FeedbackCycleUtil.generatePeriodFlag(detailE.getFeedbackCycleType(), now);
         feedbackE.setFeedbackPeriodFlag(periodFlag);

web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/TaskListAddExe.java

@@ -1,6 +1,8 @@
 package com.zcloud.safetyDutyList.command.tasklist;
 
 import com.alibaba.cola.exception.BizException;
+import com.jjb.saas.framework.auth.model.SSOUser;
+import com.jjb.saas.framework.auth.utils.AuthContext;
 import com.zcloud.safetyDutyList.domain.enums.TaskStatusEnum;
 import com.zcloud.safetyDutyList.domain.gateway.tasklist.TaskListGateway;
 import com.zcloud.safetyDutyList.domain.model.tasklist.TaskListE;
@@ -26,9 +28,21 @@ public class TaskListAddExe {
 
     @Transactional(rollbackFor = Exception.class)
     public TaskListCO execute(TaskListAddCmd cmd) {
+
+        SSOUser ssoUser = AuthContext.getCurrentUser();
+        if (ssoUser == null) {
+            throw new BizException("用户未登录");
+        }
+
         TaskListE taskListE = new TaskListE();
         BeanUtils.copyProperties(cmd, taskListE);
         taskListE.init();
+
+        // 创建者信息
+        taskListE.setCreateCorpId(ssoUser.getTenantId());
+        taskListE.setCreateDepartmentId(ssoUser.getOrgId());
+        taskListE.setCreateUserId(ssoUser.getUserId());
+
         taskListE.setStatus(TaskStatusEnum.IN_PROGRESS.getCode());
         taskListE.setIssueStatus(0);
         boolean res = taskListGateway.add(taskListE);

web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/FeedbackAddCmd.java

@@ -35,13 +35,4 @@ public class FeedbackAddCmd implements Serializable {
     @ApiModelProperty(value = "反馈内容", required = true)
     @NotEmpty(message = "反馈内容不能为空")
     private String feedbackContent;
-
-    @ApiModelProperty(value = "反馈人公司ID")
-    private Long feedbackCorpId;
-
-    @ApiModelProperty(value = "反馈人部门ID")
-    private Long feedbackDepartmentId;
-
-    @ApiModelProperty(value = "反馈人ID")
-    private Long feedbackUserId;
 }

web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/TaskListAddCmd.java

@@ -37,32 +37,4 @@ public class TaskListAddCmd implements Serializable {
     @ApiModelProperty(value = "是否启用：1-启用 0-不启用", required = true)
     @NotNull(message = "是否启用不能为空")
     private Integer switchFlag;
-
-//    @ApiModelProperty(value = "执行周期开始时间", required = true)
-//    @NotNull(message = "执行周期开始时间不能为空")
-//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-//    private LocalDateTime periodStartTime;
-//
-//    @ApiModelProperty(value = "执行周期结束时间", required = true)
-//    @NotNull(message = "执行周期结束时间不能为空")
-//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-//    private LocalDateTime periodEndTime;
-//
-//    @ApiModelProperty(value = "创建公司ID")
-//    private Long createCorpId;
-//
-//    @ApiModelProperty(value = "创建部门ID")
-//    private Long createDepartmentId;
-//
-//    @ApiModelProperty(value = "执行公司ID")
-//    private Long executeCorpId;
-//
-//    @ApiModelProperty(value = "执行部门ID")
-//    private Long executeDepartmentId;
-//
-//    @ApiModelProperty(value = "执行人员ID")
-//    private Long executeUserId;
-//
-//    @ApiModelProperty(value = "清单明细列表")
-//    private List<TaskDetailAddCmd> taskDetailList;
 }

web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/repository/impl/tasklist/TaskListRepositoryImpl.java

@@ -3,6 +3,7 @@ package com.zcloud.safetyDutyList.persistence.repository.impl.tasklist;
 import com.alibaba.cola.dto.PageResponse;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.jjb.saas.framework.auth.model.SSOUser;
 import com.jjb.saas.framework.repository.common.PageHelper;
 import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl;
 import com.zcloud.gbscommon.utils.Query;