Merge branch 'feature/0427-school' of http://git.dayaedu.com/yonge/mec into feature/0427-school

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SchoolStaffServiceImpl.java

@@ -171,7 +171,12 @@ public class SchoolStaffServiceImpl extends ServiceImpl<SchoolStaffMapper, Schoo
         // 用户帐号信息
         SysUser user = teacherDao.getUserWithPhone(schoolStaff.getMobile());
         if (Objects.nonNull(user)) {
+            // 学校员工帐号平台惟一，不能与其他帐号共存
+            if (StringUtils.isNotBlank(user.getUserType())) {
+                throw new BizException("帐号已存在");
+            }
 
+            // 后续流程暂时忽略，用户允许存在多个身份时才走以下创建账号流程
             // 校验用户是否已存在学校员工帐号
             List<String> collect = Arrays.stream(user.getUserType().split(",")).collect(Collectors.toList());
             if (collect.contains(SysUserType.SCHOOL.getCode())) {
@@ -182,7 +187,7 @@ public class SchoolStaffServiceImpl extends ServiceImpl<SchoolStaffMapper, Schoo
                     SchoolStaff staff = staffs.get(0);
 
                     if (staff.getSchoolId().longValue() != schoolStaff.getSchoolId()) {
-                        throw new BizException("员工帐号已存在");
+                        throw new BizException("帐号已存在");
                     }
                 }
             }

mec-web/src/main/java/com/ym/mec/web/controller/school/SchoolStaffController.java

@@ -3,7 +3,6 @@ package com.ym.mec.web.controller.school;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.microsvc.toolkit.common.response.paging.PageInfo;
 import com.microsvc.toolkit.common.response.paging.QueryInfo;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
@@ -16,8 +15,9 @@ import com.ym.mec.biz.service.SchoolStaffService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.exception.BizException;
+import com.ym.mec.common.page.PageInfo;
+import com.ym.mec.common.page.PageUtil;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -68,7 +68,7 @@ public class SchoolStaffController extends BaseController {
         
         IPage<SchoolStaffWrapper.SchoolStaff> pages = schoolStaffService.selectPage(QueryInfo.getPage(query), query);
         
-        return succeed(QueryInfo.pageInfo(pages));
+        return succeed(PageUtil.pageInfo(pages));
 	}
 
     @ApiOperation(value = "员工排序信息", notes = "按身份分组，返回所有员工信息")