diff --git a/platform-biz-service/src/main/resources/mainOrm/Users.xml b/platform-biz-service/src/main/resources/mainOrm/Users.xml index 17633a4..d21a88d 100644 --- a/platform-biz-service/src/main/resources/mainOrm/Users.xml +++ b/platform-biz-service/src/main/resources/mainOrm/Users.xml @@ -57,13 +57,13 @@ values (#{foreignId},#{logincenterId},#{type},#{orgId},#{deptId},#{name},#{accou foreign_id = #{foreignId,jdbcType=VARCHAR}, - + account = #{account,jdbcType=VARCHAR}, pwd = #{pwd,jdbcType=VARCHAR}, - + phone = #{phone,jdbcType=VARCHAR}, diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java index cec71f6..4271a69 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java @@ -778,6 +778,11 @@ public class UsersController extends BaseController { @RequestParam(value = "orgId",required = false) Integer orgId, @RequestParam(value = "deptId",required = false) Integer deptId) { + if(StringUtils.isBlank(phone) && StringUtils.isBlank(account)) { + ResultUtils.buildParameterErrorResultAndWrite(response, "帐号和手机号不能同时为空"); + return; + } + if(null == roleIds) { ResultUtils.buildParameterErrorResultAndWrite(response, "roleIds不能为空"); return;