1.已出完的工单,关闭的时候不需要密码

src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java

@@ -886,6 +886,14 @@ public class LiteOrderCache {
         return task;
         return task;
     }
     }
 
 
+    public LiteOrder getOrderByOrderNo(String orderNo){
+        LiteOrder liteOrder = liteOrderMap.get(orderNo);
+        if (liteOrder == null) {
+            liteOrder=liteOrderManager.findByOrderNo(orderNo);
+        }
+        return liteOrder;
+    }
+
     /**
     /**
      * 关闭工单
      * 关闭工单
      * @param orderNo
      * @param orderNo

src/main/java/com/neotel/smfcore/core/order/rest/OrderController.java

@@ -822,17 +822,28 @@ public class OrderController {
         if (orderNo == null) {
         if (orderNo == null) {
             throw new ValidateException("smfcore.valueCanotNull", "{0}不能为空", new String[]{"orderNo"});
             throw new ValidateException("smfcore.valueCanotNull", "{0}不能为空", new String[]{"orderNo"});
         }
         }
+
+        //判断工单是否已完成
+        LiteOrder order = liteOrderCache.getOrderByOrderNo(orderNo);
+        if (order == null){
+            return ResultBean.newErrorResult(-1, "smfcore.order.out.notFound", "未找到工单");
+        }
+
+        if (order.isTaskFinished()){
+
+        } else {
             //判断是否有权限密码
             //判断是否有权限密码
             String permissionPasswordCache = dataCache.getCache(Constants.CACHE_permissionPassword);
             String permissionPasswordCache = dataCache.getCache(Constants.CACHE_permissionPassword);
             if (StringUtils.isNotBlank(permissionPasswordCache)) {
             if (StringUtils.isNotBlank(permissionPasswordCache)) {
                 String permissionPassword = mapValues.get("permissionPassword");
                 String permissionPassword = mapValues.get("permissionPassword");
                 if (StringUtils.isBlank(permissionPassword)) {
                 if (StringUtils.isBlank(permissionPassword)) {
-                throw new ValidateException("smfcore.valueCanotNull", "{0}不能为空", new String[]{"permissionPassword"});
+                    throw new ValidateException("smfcore.valueCanotNull", "{0}不能为空", new String[]{"密码"});
                 }
                 }
                 if (!permissionPasswordCache.equals(permissionPassword)) {
                 if (!permissionPasswordCache.equals(permissionPassword)) {
                     throw new ValidateException("smfcore.error.permissionPassword", "权限密码错误");
                     throw new ValidateException("smfcore.error.permissionPassword", "权限密码错误");
                 }
                 }
             }
             }
+        }
         log.info("收到关闭工单:"+orderNo+",当前操作人为:"+SecurityUtils.getLoginUsername());
         log.info("收到关闭工单:"+orderNo+",当前操作人为:"+SecurityUtils.getLoginUsername());
 
 
         //如果手动关闭工单,则通知迈征
         //如果手动关闭工单,则通知迈征