Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/sooka/sponest/mobile/data/digitalenvironmentcontroller/LeaveFieldController.java

@@ -1,9 +1,9 @@
 package com.sooka.sponest.mobile.data.digitalenvironmentcontroller;
 
+import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.PageDomain;
 import com.ruoyi.common.core.web.page.TableSupport;
-import com.ruoyi.common.redis.service.RedisService;
 import com.ruoyi.common.security.utils.DictUtils;
 import com.sooka.sponest.data.api.digitalenvironment.domain.EnvironmentLeaveField;
 import com.sooka.sponest.data.api.digitalenvironment.service.RemoteLeaveFieldService;
@@ -57,7 +57,9 @@ public class LeaveFieldController {
         AjaxResult ajaxResult = leaveFieldService.edit(leaveField.getId());
         if("200".equals(ajaxResult.get("code").toString())){
             Map<String, Object> info = (Map<String, Object>) ajaxResult.get("data");
-            info.put("leaveTypeLabel", DictUtils.getDictDataByValue("farm_fukuda_type",info.get("leaveType").toString()));
+            if (StringUtils.isNotNull(info.get("leaveType"))){
+                info.put("leaveTypeLabel", DictUtils.getDictDataByValue("farm_fukuda_type",info.get("leaveType").toString()));
+            }
             PictureReplaceAll.StringToList(info);
             return appCameraService.selectCameraByIds(info);
         }else{