Merge branch 'zzd' of http://115.238.142.158:20182/XSDJ/XSDJ-ORACLE into zzd

ruoyi-lddy/src/main/java/com/ruoyi/app/controller/XsdjZlbController.java

@@ -445,7 +445,7 @@ public class XsdjZlbController extends BaseController {
      * @param type  true 流出管理 / false 流入管理
      * @return
      */
-    private StaffChangeVo checkStaffchangeParam(@RequestBody StaffChangeVo staffChange,@RequestBody Boolean type) {
+    private StaffChangeVo checkStaffchangeParam( StaffChangeVo staffChange, Boolean type) {
         staffChange.setFlowDeptId(DEPTID);
         staffChange.setDeptCode(DEPTCODE);
         if(type){

ruoyi-lddy/src/main/resources/templates/staffChange/staffChangeIn2.html

@@ -76,7 +76,7 @@
             <li class="" shiro:hasPermission="staffChange:flowIn:lrk"><a id="count3" data-toggle="tab" href="#tab-3"
                                                                          aria-expanded="false"
                                                                          onclick="changecss(this)">县级待管理</a></li>
-            <li th:if="${zbType == 1}" class="" shiro:hasPermission="staffChange:flowIn:history"><a id="count4" data-toggle="tab" href="#tab-4"
+            <li th:if="${zbType == '1'}" class="" shiro:hasPermission="staffChange:flowIn:history"><a id="count4" data-toggle="tab" href="#tab-4"
                                                                              aria-expanded="false"
                                                                              onclick="changecss(this)">流入历史</a></li>
         </ul>