Merge branch 'master' of http://62.234.61.92:3000/wjm/mec-cloud_IntelligentManufacturing_CRM

zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysLoginController.java

@@ -91,9 +91,9 @@ public class SysLoginController {
         // 生成令牌
         String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
                 loginBody.getUuid());
-        if (tokenService.getLoginUserIsAdminByToken(token)) {
-            return AjaxResult.error("用户不存在！");
-        }
+//        if (tokenService.getLoginUserIsAdminByToken(token)) {
+//            return AjaxResult.error("用户不存在！");
+//        }
         // 校验租户是否过期
         String checkTenantExpirationTimeMsg = loginService.checkTenantExpirationTime(loginBody);
         if (!checkTenantExpirationTimeMsg.isEmpty()) {
@@ -110,7 +110,7 @@ public class SysLoginController {
      * @param loginBody 登录信息
      * @return 结果
      */
-    @PostMapping("/loginadmin")
+    @PostMapping("/loginAdmin")
     public AjaxResult loginadmin(@Valid @RequestBody LoginBody loginBody, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return AjaxResult.error(bindingResult.getFieldError().getDefaultMessage());

zkqy-ui/src/views/system/tenant/code/index.vue

@@ -209,7 +209,7 @@ export default {
         pageSize: 10,
         operator: undefined,
         ipAddress: undefined,
-        isEnablePaging:false,
+        isEnablePaging:true,
       },
     };
   },