diff --git a/src/main/java/com/kiisoo/ic/login/enums/LoginEnum.java b/src/main/java/com/kiisoo/ic/login/enums/LoginEnum.java index 44b9452..5d595ad 100644 --- a/src/main/java/com/kiisoo/ic/login/enums/LoginEnum.java +++ b/src/main/java/com/kiisoo/ic/login/enums/LoginEnum.java @@ -24,6 +24,8 @@ public enum LoginEnum { LOGIN_USER_NONENTITY("用户不存在", "0005"), LOGIN_ROLE_NO_PERMISSION("该角色不能登录", "0006"), + + LOGIN_USER_BINDED("该用户的已被绑定", "0007"), ; /** diff --git a/src/main/java/com/kiisoo/ic/login/service/impl/LoginServiceImpl.java b/src/main/java/com/kiisoo/ic/login/service/impl/LoginServiceImpl.java index 66b37da..166b763 100644 --- a/src/main/java/com/kiisoo/ic/login/service/impl/LoginServiceImpl.java +++ b/src/main/java/com/kiisoo/ic/login/service/impl/LoginServiceImpl.java @@ -17,6 +17,7 @@ import com.kiisoo.ic.system.mapper.PrivilageUserDOMapper; import com.kiisoo.ic.wx.service.QWMailListManageService; import lombok.extern.slf4j.Slf4j; import me.chanjar.weixin.common.error.WxErrorException; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authc.*; @@ -146,7 +147,18 @@ public class LoginServiceImpl implements LoginService { return new LoginBean(Constants.ERROR_ROLE_NO_PERMISSION); } loginBean.setLogin(login); - loginInfoMap.put("code", LoginEnum.LOGIN_SUCCEED.getCode()); + + //查询绑定状态 + Map selectBindAccountMap = new HashMap<>(); + selectAccountMap.put("user_id", privilageUserDO.getId()); + selectAccountMap.put("type", AccountEnum.ACCOUNT_TYPE_QYWX.getType()); + List bindAccounts = privilageAccountDOMapper.selectByMap(selectAccountMap); + if (CollectionUtils.isEmpty(bindAccounts)){ + loginInfoMap.put("code", LoginEnum.LOGIN_SUCCEED.getCode()); + }else{ + loginInfoMap.put("code", LoginEnum.LOGIN_USER_BINDED.getCode()); + } + loginBean.setLoginInfo(loginInfoMap); }else { return new LoginBean(Constants.LOGIN_NO_PERMISSIONS); diff --git a/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java b/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java index d20906e..865ae41 100644 --- a/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java +++ b/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java @@ -175,6 +175,9 @@ public class StoreEmployeeService { if (CollectionUtils.isNotEmpty(poiStores)){ for (PoiStore poiStore:poiStores){ String url = poiStoreDOMapper.selectStoreQrCode(poiStore.getId()); + if (StringUtils.isBlank(url)){ + continue; + } //下载图片 BufferedInputStream in = new BufferedInputStream(employeeService.getInputStream(url)); //字节流转图片对象 diff --git a/src/main/resources/mapper/PoiStoreDOMapper.xml b/src/main/resources/mapper/PoiStoreDOMapper.xml index 55b4275..c06d931 100644 --- a/src/main/resources/mapper/PoiStoreDOMapper.xml +++ b/src/main/resources/mapper/PoiStoreDOMapper.xml @@ -51,5 +51,6 @@ from privilage_cp_user_store t1,privilage_cp_user t2 where t1.cp_user_id = t2.id and t1.store_id = #{shopId} + limit 1