966120Api.git - Gitblit

			@@ -17,6 +17,11 @@
			/** 用户账号 */
			private String userName;

			/**
			* 用户级别（-1 表示停用）
			*/
			private Integer level;

			/** 用户昵称 */
			private String nickName;

			@@ -151,6 +156,16 @@
			this.canCreateTask = canCreateTask;
			}

			public Integer getLevel()
			{
			return this.level;
			}

			public void setLevel(Integer level)
			{
			this.level = level;
			}

			@Override
			public String toString()
			{

			@@ -137,6 +137,8 @@
			{
			userByName.setSex(dto.getSex());
			}
			userByName.setDelFlag(dto.getLevel()==-1?"2":"0");
			userByName.setStatus(dto.getLevel()==-1?"1":"0");
			userByName.setUpdateBy("sync");
			sysUserMapper.updateUser(userByName);
			updatedCount++;
			@@ -212,7 +214,8 @@
			existingUser.setPhonenumber(dto.getPhonenumber());
			}
			}

			existingUser.setStatus(dto.getLevel()==-1?"1":"0");
			existingUser.setDelFlag(dto.getLevel()==-1?"2":"0");
			if (StringUtils.isNotEmpty(dto.getSex()))
			{
			existingUser.setSex(dto.getSex());
			@@ -237,6 +240,7 @@
			existingUser.setQyWechatUserId(dto.getOaWeixinUserId());
			existingUser.setQyWechatUpdateTime(new Date());
			}

			sysUserMapper.updateUser(existingUser);
			}

			@@ -310,7 +314,8 @@
			newUser.setPassword(SecurityUtils.encryptPassword("123456"));

			// 设置默认状态为正常
			newUser.setStatus("0");
			newUser.setStatus(dto.getLevel()==-1?"1":"0");
			newUser.setDelFlag(dto.getLevel()==-1?"2":"0");

			newUser.setCreateBy("sync");

			@@ -12,6 +12,7 @@
			<result property="departmentId" column="department_id" />
			<result property="sex" column="sex" />
			<result property="email" column="email" />
			<result property="level" column="level" />
			<result property="phonenumber" column="phonenumber" />
			<result property="oaOrderClass" column="OA_OrderClass" />
			<result property="canViewAllConsult" column="can_view_all_consult" />
			@@ -29,6 +30,7 @@
			OA_departmentID AS department_id,
			OA_gender AS sex,
			OA_email AS email,
			OA_execLevel as level,
			OA_mobile AS phonenumber,
			OA_OrderClass AS OA_OrderClass,
			CASE

	ruoyi-system/src/main/java/com/ruoyi/system/domain/UserSyncDTO.java	15 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserSyncServiceImpl.java	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-system/src/main/resources/mapper/system/UserSyncMapper.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史