Merge remote-tracking branch 'origin/master'

src/main/java/io/office/modules/manage/controller/TycpdmFirmController.java

@@ -262,6 +262,8 @@ public class TycpdmFirmController extends AbstractController {
     }
 
 
+
+
     /**
      * 返回文件 url
      */
@@ -293,7 +295,6 @@ public class TycpdmFirmController extends AbstractController {
         }
         String url= tycpdmFirmService.redirectGDSURL(memberEntity,params);
         try {
-            response.sendRedirect(url);
             return R.ok().put("data",url);
         } catch (Exception e) {
             e.printStackTrace();
@@ -310,7 +311,6 @@ public class TycpdmFirmController extends AbstractController {
         MemberEntity memberUser = getMemberUser();
         String url= tycpdmFirmService.redirectGDSGLN(memberUser);
         try {
-            response.sendRedirect(url);
             return R.ok().put("data",url);
         } catch (Exception e) {
             e.printStackTrace();
@@ -324,9 +324,11 @@ public class TycpdmFirmController extends AbstractController {
      * 跳转业务大厅页面
      */
     @RequestMapping("/authApi/redirectBusinessHall")
-    public R redirectBusinessHall(@RequestBody  Map<String, Object> params,HttpServletResponse response){
+    public R redirectBusinessHall(String id,String userType,HttpServletResponse response){
         //由于member表中没有手机用户的信息 通过memberDao获取
-        Object id = params.get("id");
+        Map<String,Object> params = new HashMap<>();
+        params.put("id",id);
+        params.put("userType",userType);
         /*MemberEntity memberEntity = memberDao.selectById(Long.valueOf(id.toString()));
         if (memberEntity==null){
             memberEntity=new MemberEntity();
@@ -342,6 +344,7 @@ public class TycpdmFirmController extends AbstractController {
         }
     }
 
+
     /**
      * 修改企业信息回显(不需要审批)
      */