Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserExamineController.java

@@ -95,7 +95,6 @@ public class SysUserExamineController extends BaseController {
     @RequiresPermissions("system:userexamine:examineprint")
     @Log(title = "用户审核", businessType = BusinessType.PRINT)
     @GetMapping("/examineprint/{userId}")
-    @ResponseBody
     public String paint(@PathVariable("userId") Long userId,ModelMap mmap)
     {
         List<SysRole> roles = roleService.selectRolesByUserId(userId);

ruoyi-admin/src/main/resources/templates/system/user/userexamine/userexamine.html

@@ -113,10 +113,10 @@
                         var actions = [];
                         if(row.examine !== '2'){
                             actions.push('<a disabled class="btn btn-success btn-xs ' + examineFlag + '" href="javascript:void(0)"><i class="fa fa-edit"></i>审核</a> ');
-                            actions.push('<a class="btn btn-success btn-xs ' + downloadFlag + '" href="javascript:void(0)"><i class="fa fa-download"></i>打印</a> ');
+                            actions.push('<a class="btn btn-success btn-xs ' + downloadFlag + '" href="javascript:void(0)"  onclick="examineprint(\'' + row.userId + '\')"><i class="fa fa-download"></i>打印</a> ');
                         }else{
                             actions.push('<a class="btn btn-success btn-xs ' + examineFlag + '" href="javascript:void(0)" onclick="examinedetail(\'' + row.userId + '\')"><i class="fa fa-edit"></i>审核</a> ');
-                            actions.push('<a class="btn btn-success btn-xs ' + downloadFlag + '" href="javascript:void(0)" onclick="download(\'' + row.userId + '\')"><i class="fa fa-download"></i>打印</a> ');
+                            actions.push('<a class="btn btn-success btn-xs ' + downloadFlag + '" href="javascript:void(0)" onclick="examineprint(\'' + row.userId + '\')"><i class="fa fa-download"></i>打印</a> ');
                         }
                         return actions.join('');
                     }
@@ -128,9 +128,9 @@
         var url ='/system/userexamine/examine/' + id;
         $.modal.openTab("涉密人员审核", url);
     }
-    function download(id){
+    function examineprint(id){
-        var url ='/system/userexamine/examine/' + id;
+        var url ='system/userexamine/examineprint/' + id;
-        $.modal.openTab("涉密人员审核", url);
+        $.modal.openTab("打印", url);
     }
 </script>
 </body>