微信自动登录获取二维码修复bug

core-service/src/main/java/com/winsun/item/modular/system/controller/LoginPwdController.java

@@ -112,7 +112,7 @@ public class LoginPwdController extends BaseController {
         }
         /*jsonObject = HttpHelper.doGet(url);*/
         Map<String, Object> hashMap = new HashMap<>();
-        log.info(jsonObject);
+        log.info("defaultLogin:"+jsonObject);
         hashMap.put("info", JSONObject.parseObject(jsonObject));
         /*  Map<String,Object> map = JSON.toJavaObject(jsonObject,Map.class);*/
         Map<String, Object> map = JSON.parseObject(jsonObject, Map.class);
@@ -120,17 +120,24 @@ public class LoginPwdController extends BaseController {
         Wrapper<HhrUser> wrapper = new EntityWrapper<>();
         wrapper.eq("open_id", openId);
         log.info("openId:" + openId);
-
         List<HhrUser> hhrUsers = hhrUserMapper.selectList(wrapper);
         if (hhrUsers.size() == 0) {
             return ResponseData.error(hashMap, "当前微信未绑定账号，请先登录绑定账号！");
         }
-        HhrUser hhrUser = hhrUsers.get(0);
-        SysUser sysUser = sysUserMapper.selectById(hhrUser.getId());
+
+        SysUser sysUser = new SysUser();
+        for(HhrUser hhrUser : hhrUsers) {
+            sysUser = sysUserMapper.selectById(hhrUser.getId());
+            if(sysUser.getStatus().equals("1")) {
+                break;
+            }else {
+                sysUser = new SysUser();
+            }
+        }
         if (StringUtils.isBlank(sysUser.getAccount())) {
             return ResponseData.error(hashMap, "当前账号异常！");
         }
-
+        log.info("sysUser.getAccount()"+sysUser.getAccount());
         // 信息正确，调用登录
         return this.loginvalid(hashMap, sysUser.getAccount(), openId);
     }
@@ -173,6 +180,7 @@ public class LoginPwdController extends BaseController {
      * @return
      */
     private ResponseData<Map<String, Object>> loginvalid(Map<String, Object> hashMap, String username, String openId) {
+
         try {
             // 关闭错误登录校验
             stringRedisTemplate.opsForValue().set("SYS_LOGIN_ERROR" + username, "1");
@@ -184,7 +192,7 @@ public class LoginPwdController extends BaseController {
             }
             ResponseData<String> checkUserName = LoginUtils.checkUserName(username);
             if (!checkUserName.isSuccess()) {
-                return ResponseData.error(hashMap, canLogin.getMsg());
+                return ResponseData.error(hashMap, checkUserName.getMsg());
             }
             // 获取数据库中的账号密码，准备比对
             User user = userService.getByAccount(username);
@@ -198,7 +206,6 @@ public class LoginPwdController extends BaseController {
                 return ResponseData.error(hashMap, "授权登录错误");
             }
             Map<String, Object> map = (Map<String, Object>) object;
-
             log.info("login result :{}", JSON.toJSONString(object));
             Map<String, Object> resultMap = new HashMap<>();
             resultMap.put("sessionId", map.get("sessionId"));
@@ -278,6 +285,7 @@ public class LoginPwdController extends BaseController {
         }
         Wrapper<SysUser> wrapperU = new EntityWrapper<>();
         wrapperU.eq("account", username);
+        wrapperU.eq("status",1);
         List<SysUser> users = sysUserMapper.selectList(wrapperU);
         if (users.size() == 0) {
             return ResponseData.error("当前账号有误！");
@@ -303,7 +311,7 @@ public class LoginPwdController extends BaseController {
             Map<String, Object> map1 = JSON.parseObject(jsonObject1, Map.class);
             String headimgurl = map1.get("headimgurl").toString();
             String nickname = map1.get("nickname").toString();
-            Wrapper wrapper = new EntityWrapper<>();
+            Wrapper<HhrUser> wrapper = new EntityWrapper<>();
             wrapper.eq("id", sysUser.getId());
             Map<String, Object> dataMapping = new HashMap<>();
             // 不绑定微信则不保存openId
@@ -715,16 +723,23 @@ public class LoginPwdController extends BaseController {
         }
         Wrapper<SysUser> wrapper = new EntityWrapper<>();
         wrapper.eq("account", account);
+        wrapper.ne("status", "3");
         List<SysUser> users = sysUserMapper.selectList(wrapper);
         if (users.size() != 0) {
             return ResponseData.error("账号已被使用，请联系管理员！");
         }
 
-        Wrapper<HhrUser> wrapper1 = new EntityWrapper<>();
-        wrapper1.eq("id_card", idCard);
-        List<HhrUser> hhrUsers = hhrUserMapper.selectList(wrapper1);
-        if (hhrUsers.size() != 0) {
-            return ResponseData.error("一个身份证只能创建一个账号，请换一个身份证！");
+        Wrapper<HhrUser> hhrWrapper = new EntityWrapper<HhrUser>();
+        hhrWrapper.eq("id_card", idCard);
+        List<HhrUser> hhrList = hhrUserMapper.selectList(hhrWrapper);
+        if(hhrList.size() > 0) {
+            for(HhrUser hhrUser : hhrList) {
+                SysUser sysUser = sysUserMapper.selectById(hhrUser.getId());
+                if(!sysUser.getStatus().equals("3")) {
+                    // 判断剔除已删除的用户
+                    return ResponseData.error("身份证已存在");
+                }
+            }
         }
 
         int insert = 0;