1

wcs/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java

@@ -205,8 +205,11 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
     public Instruction findById(String instruction_id) {
         WQLObject wo = WQLObject.getWQLObject("acs_instruction");
         JSONObject json = wo.query("instruction_id ='" + instruction_id + "'").uniqueResult(0);
-        final Instruction obj = json.toJavaObject(Instruction.class);
+        if(ObjectUtil.isNotEmpty(json)){
-        return obj;
+            final Instruction obj = json.toJavaObject(Instruction.class);
+            return obj;
+        }
+        return null;
     }
 
     @Override
@@ -635,7 +638,7 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
     @Transactional(rollbackFor = Exception.class)
     public void update(Instruction dto) {
         Instruction entity = this.findById(dto.getInstruction_id());
-        //if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!");
+        if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!");
 
         String currentUsername = SecurityUtils.getCurrentUsername();
         String now = DateUtil.now();

wcs/qd/src/views/acs/stage/editor/index.vue

@@ -231,8 +231,10 @@ export default {
         { id: 10, name: '墙面竖', img1: '墙面竖' },
         { id: 11, name: '区域横', img1: '区域横' },
         { id: 12, name: '区域竖', img1: '区域竖' },
-        { id: 13, name: '专机', img1: '专机' }
+        { id: 13, name: '专机', img1: '专机' },
-
+        { id: 14, name: '激', img1: '激' },
+        { id: 15, name: '光', img1: '光' },
+        { id: 16, name: '区', img1: '区' }
       ],
       arr2: [],
       stageSelectList: [],