java/qijisheng.git

			@@ -91,7 +91,7 @@
			if (UserStatus.DISABLE.getCode().equals(user.getStatus())) {
			recordLogService.recordLogininfor(request, user.getUserId().intValue(), username, Constants.LOGIN_FAIL_STATUS, "用户已停用，请联系管理员");
			// throw new ServiceException("对不起，您的账号：" + username + " 已停用");
			throw new ServiceException("您的账号已被禁用，请联系平台");
			throw new ServiceException("您所属门店已被冻结，请联系平台");
			}
			passwordService.validate(user, password, request);
			recordLogService.recordLogininfor(request, user.getUserId().intValue(), username, Constants.LOGIN_SUCCESS_STATUS, "登录成功");

			@@ -39,7 +39,7 @@
			and t2.phone like concat('%',#{agentQuery.phone},'%')
			</if>
			<if test="agentQuery.vipId !=null">
			and t1.applicationVipId = #{agentQuery.vipId}
			and t1.application_vip_id = #{agentQuery.vipId}
			</if>
			<if test="agentQuery.status !=null">
			and t1.status = #{agentQuery.status}

			@@ -76,6 +76,7 @@
			Page<Technician> page = technicianService.lambdaQuery().like(name != null, Technician::getName, name)
			.like(phone != null, Technician::getPhone, phone)
			.eq(Technician::getShopId, sysUser.getObjectId())
			.eq(Technician::getDelFlag, 0)
			.page(Page.of(pageNum, pageSize));
			return R.ok(page);
			}
			@@ -91,7 +92,10 @@

			if (technician.getId()==null) {
			technician.setSubscribeStatus(2);
			List<Technician> list = technicianService.lambdaQuery().eq(Technician::getPhone, technician.getPhone()).eq(Technician::getShopId, sysUser.getObjectId()).list();
			List<Technician> list = technicianService.lambdaQuery()
			.eq(Technician::getPhone, technician.getPhone())
			.eq(Technician::getShopId, sysUser.getObjectId())
			.eq(Technician::getDelFlag, 0).list();
			if (!list.isEmpty()) {
			return R.fail("当前号码已经添加");
			}
			@@ -113,7 +117,9 @@
			if (byId.getPhone()!=technician.getPhone()){
			List<Technician> list = technicianService.lambdaQuery()
			.eq(Technician::getPhone, technician.getPhone())
			.ne(Technician::getId, byId.getId()).list();
			.eq(Technician::getShopId, sysUser.getObjectId())
			.ne(Technician::getId, byId.getId())
			.eq(Technician::getDelFlag, 0).list();
			if (!list.isEmpty()) {
			return R.fail("当前号码已经添加");
			}

	ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-account/src/main/resources/mapper/account/AgentApplicationMapper.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianController.java	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史