java/zhihuishenqu.git

			@@ -69,7 +69,7 @@
			if(huaChengSysUser==null)
			{
			SysUser newUser = new SysUser();
			newUser.setUserId(Snowflake.getId());
			newUser.setUserId(Snowflake.getId()+"");
			newUser.setLoginName(phonenumber);
			newUser.setUserName(phonenumber.substring(0,3)+"xxxx"+phonenumber.substring(7,11)+"用户");
			newUser.setUserType("3");
			@@ -82,7 +82,7 @@
			else
			{
			SysUser newUser = new SysUser();
			newUser.setUserId(huaChengSysUser.getUserId());
			newUser.setUserId(huaChengSysUser.getUserId()+"");
			newUser.setLoginName(huaChengSysUser.getPhone());
			newUser.setUserName(huaChengSysUser.getNickName());
			newUser.setUserType("3");
			@@ -158,7 +158,7 @@
			SysUser newUser = new SysUser();
			if(huaChengSysUser==null)
			{
			newUser.setUserId(Snowflake.getId());
			newUser.setUserId(Snowflake.getId()+"");
			newUser.setLoginName(phonenumber);
			newUser.setUserName(phonenumber.substring(0,3)+"xxxx"+phonenumber.substring(7,11)+"用户");
			newUser.setUserType("3");
			@@ -223,8 +223,8 @@
			}

			@Override
			public List<SysUser> queryList(Integer userType) {
			return baseMapper.queryList(userType);
			public List<SysUser> queryList(Integer userType,String keyWord) {
			return baseMapper.queryList(userType,keyWord);
			}

			public List<String> getDepartmentIds( List<OrganizationChartEntity> organizationChartEntities,List<String> departmentIds){
			@@ -245,8 +245,8 @@
			}

			@Override
			public SysUser selectData(String userId,String phonenumber) {
			return baseMapper.selectData(userId,phonenumber);
			public SysUser selectData(String userId,String phonenumber,String loginName) {
			return baseMapper.selectData(userId,phonenumber,loginName);
			}