Merge branch 'develop' into dev-LeeD

# Conflicts:
#	src/com/engine/salary/encrypt/AESEncryptUtil.java

src/com/engine/salary/web/SalaryArchiveController.java

@@ -440,6 +440,10 @@ public class SalaryArchiveController {
         if (StringUtils.isNotBlank(archiveStatus)) {
             param.setArchiveStatus(archiveStatus);
         }
+        String runStatusLists = request.getParameter("runStatusList");
+        if (StringUtils.isNotBlank(runStatusLists)) {
+            param.setRunStatusList(Arrays.stream(runStatusLists.split(",")).collect(Collectors.toList()));
+        }
         return param;
     }