|
|
@@ -189,8 +189,8 @@ public class StaffService extends BaseService<Staff> {
|
|
|
staffQuery.setCpId(cpId);
|
|
|
List<StaffResponse> staffResponsesFlgCanLogin = staffMapper.selectByCond(staffQuery);
|
|
|
if (staffResponsesFlgCanLogin != null && staffResponsesFlgCanLogin.size() > 0 ) {
|
|
|
- List<StaffResponse> collectPc = staffResponsesFlgCanLogin.stream().filter(it -> it.getLoginType() == 1 || it.getLoginType() == 3).collect(Collectors.toList());
|
|
|
- List<StaffResponse> collectWx = staffResponsesFlgCanLogin.stream().filter(it -> it.getLoginType() == 2 || it.getLoginType() == 3).collect(Collectors.toList());
|
|
|
+ List<StaffResponse> collectPc = staffResponsesFlgCanLogin.stream().filter(it -> (it.getLoginType()!=null && it.getLoginType() == 1) || (it.getLoginType()!=null && it.getLoginType() == 3)).collect(Collectors.toList());
|
|
|
+ List<StaffResponse> collectWx = staffResponsesFlgCanLogin.stream().filter(it -> (it.getLoginType()!=null && it.getLoginType() == 2) || (it.getLoginType()!=null && it.getLoginType() == 3)).collect(Collectors.toList());
|
|
|
if ((staffVO.getLoginType() == 1 || staffVO.getLoginType() == 3 ) &&
|
|
|
collectPc != null && collectPc.size() > 0 && intWebMaxnum < collectPc.size() + 1) {
|
|
|
// 无用户
|
|
|
@@ -258,6 +258,12 @@ public class StaffService extends BaseService<Staff> {
|
|
|
staff.setStaffId(codeMap.get("outId").toString());
|
|
|
staff.setStaffCode(codeMap.get("outNote").toString());
|
|
|
staff.setFlgCanLogin(true);
|
|
|
+ // 标准版
|
|
|
+ if(Constant.GradeCode.STD.getName().equals(staffVO.getGradeCode())){
|
|
|
+ staff.setLoginType(2);
|
|
|
+ }else{
|
|
|
+ staff.setLoginType(3);
|
|
|
+ }
|
|
|
super.insert(staff);
|
|
|
return ResponseResultUtil.success(staff);
|
|
|
}
|