【功能修改】app 端:存粮人,选择仓房修改

delivery-module-core/delivery-module-core-api/src/main/java/com/unis/module/core/enums/ErrorCodeConstants.java

@@ -34,6 +34,7 @@ public interface ErrorCodeConstants {
     ErrorCode APP_PARAM_ERROR = new ErrorCode(2_006_000_002, "参数有误");
     ErrorCode APP_TASK_RECEIVE_ERROR = new ErrorCode(2_006_000_003, "领取任务有误或已被其他人领取");
     ErrorCode APP_TASK_RECEIVE_ERROR_RETRY = new ErrorCode(2_006_000_004, "已打卡请重试");
+    ErrorCode APP_PARAM_ERROR_STORAGE = new ErrorCode(2_006_000_005, "请选择仓库");
 
     /**出入库信息不存在*/
     ErrorCode CRKXX_NOT_EXISTS = new ErrorCode(2_007_000_001, "出入库信息不存在");

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/service/task/TaskServiceImpl.java

@@ -151,14 +151,18 @@ public class TaskServiceImpl implements TaskService {
 
     @Override
     public Boolean getStoreroom(TaskPageReqVO reqVO) {
+        if(reqVO.getCaIds() == null || reqVO.getCaIds().isEmpty()){
+            throw exception(ErrorCodeConstants.APP_PARAM_ERROR_STORAGE);
+        }
 
         // 存粮人选定仓 新增数据 以仓房为单位
-        if(0 == reqVO.getClrsfxd()) {
+        if(reqVO.getClrsfxd() != null && 0 == reqVO.getClrsfxd()) {
             //存粮人删除选定
             reqVO.getCaIds().forEach(caId ->
                     usersMapper.delete(new QueryWrapper<UsersDO>().lambda()
                             .eq(UsersDO::getCreator, SecurityFrameworkUtils.getLoginUserId())
                             .eq(UsersDO::getCaId, caId)));
+
         } else {
             // 校验 是登录人可选的任务
             List<TaskCaxxRespVO> taskCaxxRespVOS = verifyStoreroom(reqVO);
@@ -326,7 +330,7 @@ public class TaskServiceImpl implements TaskService {
 
         List<TaskCaxxRespVO> taskList = getCaxxByKqIdForClr(pageReqVO);
 
-        if(taskList.size() != reqVO.getKqIds().size()) {
+        if(taskList.size() != reqVO.getCaIds().size()) {
             throw exception(ErrorCodeConstants.APP_TASK_RECEIVE_ERROR);
         }
         return taskList;