合并

CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/impl/ToBannerServiceImpl.java

@@ -209,7 +209,9 @@ public class ToBannerServiceImpl implements IToBannerService {
             toBannerVO.setBannerPositionName(e.getBannerPosition() == 1?"首页banner":"服务banner");
 
             ToUser toUser = toUserMapper.selectByPrimaryKey(e.getUpdateUser());
-            toBannerVO.setUpdateUserName(toUser.getUserName());
+            if (null != toUser) {
+                toBannerVO.setUpdateUserName(toUser.getUserName());
+            }
 
             return toBannerVO;
 

CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/impl/ToUserServerImpl.java

@@ -67,6 +67,10 @@ public class ToUserServerImpl implements IToUserService {
             response.addError("您不是系统人员，不可登录");
             return response;
         }
+        if ("0".equals(currentUser.getStatus())) {
+            response.addError("您的账号已被停用!");
+            return response;
+        }
 
         ToUserVO userVO = new ToUserVO();
         BeanUtils.copyProperties(currentUser,userVO);