Merge remote-tracking branch 'origin/developer' into developer

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/LoginController.java

@@ -300,6 +300,10 @@ public class LoginController extends WebBaseController {
             logger.info("gic账号不存在,eid={},phone={}", gicEnterpriseId, loginPhoneNumber);
             return "1003";
         }
+        if(clerk.getStatus() != 1) {
+            logger.info("gic冻结,eid={},phone={}", gicEnterpriseId, loginPhoneNumber);
+            return "1006" ;
+        }
         EnterpriseDTO en = this.enterpriseService.getEnterpriseById(gicEnterpriseId) ;
         webLoginDTO.setLoginChannel(loginChannel);
         webLoginDTO.setClerkId(clerk.getClerkId());
@@ -337,6 +341,8 @@ public class LoginController extends WebBaseController {
             return "通过手机号查询clerk，查询不到";
         } else if (code.equals("1004")) {
             return "企微应用未授权";
+        } else if(code.equals("1006")) {
+            return "账号已冻结,请联系管理员" ;
         }  else {
             return "系统异常";
         }