修改登录页面

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/AuthRedirectController.java

@@ -264,6 +264,7 @@ public class AuthRedirectController {
     }
 
 
+    //企业内部应用登录接口
     @RequestMapping("/corpInsideWXAuth")
     public ModelAndView authInside(String code, String state) throws Exception{
         Map<String,Object> reqParam = new HashMap<String,Object>(16);
@@ -324,7 +325,7 @@ public class AuthRedirectController {
         }
 
         String redirecUrl = null;
-        String router = "index";
+        String router = "login";
         if (companyId > 0) {
             HashMap compExpireInfo = getCompExpireInfo(companyId);
             if (compExpireInfo != null) {

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/WeiXinCorpController.java

@@ -3792,7 +3792,7 @@ public class WeiXinCorpController {
                         for (int m=0;m<jsonArray.size(); m++) {
                             JSONObject userJson = jsonArray.getJSONObject(m);
                             String curUserid = userJson.getString("userid");
-                            String openUserid = userJson.getString("open_userid");
+//                            String openUserid = userJson.getString("open_userid");
                             int status = userJson.getIntValue("status");
                             if(status!=1){
                                 continue;
@@ -3807,7 +3807,7 @@ public class WeiXinCorpController {
                                     .setRoleName(role.getRolename())
                                     .setCompanyId(company.getId())
                                     .setName(userJson.getString("name"))
-                                    .setCorpwxUserid(openUserid)
+                                    .setCorpwxUserid(curUserid)
                                     .setCorpwxRealUserid(curUserid)
                                     .setColor(ColorUtil.randomColor())
                                     .setJobNumber(curUserid)
@@ -3853,7 +3853,7 @@ public class WeiXinCorpController {
                                 if (userInfoOb.getInteger("status") != 1) continue;
                                 String userName = String.valueOf(userInfoOb.get("name"));
 //                                String phone = String.valueOf(userInfoOb.get("phone"));
-                                String openUserid = userInfoOb.getString("open_userid");
+//                                String openUserid = userInfoOb.getString("open_userid");
                                 List<Integer> departments = (List<Integer>) userInfoOb.get("department");
                                 Integer deptId = departments.get(0);
                                 User user=new User();