Просмотр исходного кода

1:PC端,2:移动端,3:PC+移动端

姜永辉 1 год назад
Родитель
Сommit
b604e1ce2d

+ 2 - 2
src/main/java/com/dk/mdm/model/pojo/mst/Staff.java

@@ -194,9 +194,9 @@ public class Staff extends PageInfo<Staff> implements Serializable {
     private Boolean flgCanLogin;
 
     /**
-     * 1:PC端,2:移动端,3:PC+移动端
+     * 1:PC端,2:移动端,3:PC+移动端, 4:无
      */
-    @ApiModelProperty(value = "1:PC端,2:移动端,3:PC+移动端")
+    @ApiModelProperty(value = "1:PC端,2:移动端,3:PC+移动端, 4:无")
     private Integer loginType;
 
 

+ 8 - 2
src/main/java/com/dk/mdm/service/mst/StaffService.java

@@ -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);
     }