java/jiashida.git

			@@ -132,11 +132,15 @@
			}
			TAppUser appUser = appUserService.getById(dto.getId());
			String code = appUser.getCode();
			if (dto.getCode() != null && !dto.getCode().isEmpty() && code!=null && !code.equals(dto.getCode())) {
			if(code==null){
			appUser.setCode(dto.getCode());
			}else {
			if (dto.getCode() != null && !dto.getCode().isEmpty() && !dto.getCode().equals(code)) {
			appUser.setCode(dto.getCode());
			// 移除之前的二维码
			redisTemplate.delete("USER_WX_IMG" + appUser.getId());
			}
			}
			if (dto.getPromotionStatus() != null) {
			appUser.setPromotionStatus(dto.getPromotionStatus());
			}

			@@ -126,6 +126,7 @@
			user.setPassword(company.getPassword());
			user.setPhonenumber(company.getChargePersonPhone());
			user.setNickName(company.getChargePerson());
			user.setCode(company.getCode());
			user.setRoleId(2l);
			if (!userService.checkUserNameUnique(user)) {
			return R.fail("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
			@@ -267,6 +268,8 @@
			{
			return R.fail("新增用户'" + user.getUserName() + "'失败，推广号已存在");
			}


			user.setCreateBy(getUsername());
			user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));

			@@ -323,6 +323,7 @@
			<if test="remark != null and remark != ''">remark,</if>
			<if test="code != null and code != ''">code,</if>
			<if test="isAdmin != null">is_admin,</if>
			<if test="companyId != null">company_id,</if>
			<if test="roleType != null">role_type,</if>
			create_time
			)values(
			@@ -341,6 +342,7 @@
			<if test="remark != null and remark != ''">#{remark},</if>
			<if test="code != null and code != ''">#{code},</if>
			<if test="isAdmin != null">#{isAdmin},</if>
			<if test="companyId != null">#{companyId},</if>
			<if test="roleType != null">#{roleType},</if>
			sysdate()
			)
			@@ -364,6 +366,7 @@
			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
			<if test="remark != null">remark = #{remark},</if>
			<if test="disableRemark != null">disable_remark = #{disableRemark},</if>
			<if test="code != null and code!=''">code = #{code},</if>
			<if test="companyId != null">company_id = #{companyId},</if>
			update_time = sysdate()
			</set>

	ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCompanyController.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史