fix
This commit is contained in:
@@ -118,7 +118,7 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl<PlayClerkUserInfoM
|
|||||||
if (map.containsKey("3")) {
|
if (map.containsKey("3")) {
|
||||||
result.setAudioAllowEdit(false);
|
result.setAudioAllowEdit(false);
|
||||||
}
|
}
|
||||||
//如果存在未审批的申请,或者当前已经是店员
|
//如果存在未审批的申请,或者当前已经是店员-可以申请陪聊
|
||||||
PlayClerkUserReviewInfoEntity entity = playClerkUserReviewInfoService.queryByClerkId(userInfo.getId(), "0");
|
PlayClerkUserReviewInfoEntity entity = playClerkUserReviewInfoService.queryByClerkId(userInfo.getId(), "0");
|
||||||
if (entity != null || "1".equals(result.getClerkState())) {
|
if (entity != null || "1".equals(result.getClerkState())) {
|
||||||
result.setClerkAllowEdit(false);
|
result.setClerkAllowEdit(false);
|
||||||
@@ -132,6 +132,16 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl<PlayClerkUserInfoM
|
|||||||
}
|
}
|
||||||
result.setCommodity(playClerkCommodityQueryVos);
|
result.setCommodity(playClerkCommodityQueryVos);
|
||||||
result.setArea(userInfo.getProvince() + "-" + userInfo.getCity());
|
result.setArea(userInfo.getProvince() + "-" + userInfo.getCity());
|
||||||
|
//设置店员是否运行登录
|
||||||
|
if ("0".equals(userInfo.getOnboardingState())) {
|
||||||
|
result.setAllowLogin("1");
|
||||||
|
result.setDisableLoginReason("你已离职,需要复职请联系店铺管理员");
|
||||||
|
}
|
||||||
|
if ("0".equals(userInfo.getListingState())) {
|
||||||
|
result.setAllowLogin("1");
|
||||||
|
result.setDisableLoginReason("你已被下架,没有权限访问");
|
||||||
|
}
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -136,4 +136,15 @@ public class PlayClerkUserLoginResponseVo {
|
|||||||
private List<PlayClerkCommodityQueryVo> commodity = new ArrayList<>();
|
private List<PlayClerkCommodityQueryVo> commodity = new ArrayList<>();
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 是否允许登录(0:允许,1:不允许)
|
||||||
|
*/
|
||||||
|
private String allowLogin = "0";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 禁止登录原因
|
||||||
|
*/
|
||||||
|
private String disableLoginReason;
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user