1.增加苹果测试账号

2.人员信息导出接口bug修改
3.经销商app-理赔增加品牌，花纹字段及接口逻辑
4.门店app-理赔，轮胎保增加品牌，花纹字段及接口逻辑

blade-auth/src/main/java/org/springblade/auth/verification/verificationController.java

@@ -74,29 +74,33 @@ public class verificationController {
 		if (Objects.nonNull(redisCode)) {
 			return R.fail("验证码已发送，请勿重复发送");
 		}
-		String code = VerificationCodeUtil.getVerificationCode(NumberEnum.SIX.number);
-		// String code = "123456";
-		System.out.println("验证码：" + code);
-		String parameter = String.format(CommonEnum.SMS_MSG_TEMPLATE.info, code, NumberEnum.FIVE.number);
-		R<SmsResponse> responseR = smsClient.sendMessage("tencent-kbs", parameter, phone);
-		if (R.isNotSuccess(responseR)) {
-			log.error("短信发送失败：{}",responseR);
-			return R.fail("短信发送失败，请稍后重试");
-		}
-		System.out.println(JSONObject.toJSONString(responseR));
-		SmsResponse smsResponse = responseR.getData();
-		if (ObjectUtils.isEmpty(smsResponse)) {
-			log.error("短信发送失败-data数据为空");
-			return R.fail("短信发送失败，请稍后重试");
-		}
-		if (!org.springframework.util.StringUtils.hasText(smsResponse.getMsg())) {
-			log.error("短信发送失败-腾讯云短信返回数据为空");
-			return R.fail("短信发送失败，请稍后重试");
-		}
-		JSONObject msgJson = JSONObject.parseObject(smsResponse.getMsg());
-		if (msgJson.getInteger("result") != 0) {
-			log.error("短信发送失败-腾讯云短信发送失败：{}", smsResponse.getMsg());
-			return R.fail("短信发送失败，请稍后重试");
+		String code;
+		if("15948888888".equals(phone) || "15948888889".equals(phone)){
+			code = "123456";
+		}else{
+			code = VerificationCodeUtil.getVerificationCode(NumberEnum.SIX.number);
+			System.out.println("验证码：" + code);
+			String parameter = String.format(CommonEnum.SMS_MSG_TEMPLATE.info, code, NumberEnum.FIVE.number);
+			R<SmsResponse> responseR = smsClient.sendMessage("tencent-kbs", parameter, phone);
+			if (R.isNotSuccess(responseR)) {
+				log.error("短信发送失败：{}",responseR);
+				return R.fail("短信发送失败，请稍后重试");
+			}
+			System.out.println(JSONObject.toJSONString(responseR));
+			SmsResponse smsResponse = responseR.getData();
+			if (ObjectUtils.isEmpty(smsResponse)) {
+				log.error("短信发送失败-data数据为空");
+				return R.fail("短信发送失败，请稍后重试");
+			}
+			if (!org.springframework.util.StringUtils.hasText(smsResponse.getMsg())) {
+				log.error("短信发送失败-腾讯云短信返回数据为空");
+				return R.fail("短信发送失败，请稍后重试");
+			}
+			JSONObject msgJson = JSONObject.parseObject(smsResponse.getMsg());
+			if (msgJson.getInteger("result") != 0) {
+				log.error("短信发送失败-腾讯云短信发送失败：{}", smsResponse.getMsg());
+				return R.fail("短信发送失败，请稍后重试");
+			}
 		}
 		redisUtils.set(CacheNames.APP_LOGIN_CODE_KEY + redisKey, code, NumberEnum.FIVE_HUNDRED.number);
 		return R.success("发送成功，请留意手机短信");

blade-common/src/main/java/org/springblade/common/dto/TeHbbTob.java

@@ -35,4 +35,9 @@ public class TeHbbTob {
 	 * 花纹
 	 */
 	private String pattern;
+
+	/**
+	 * 品牌
+	 */
+	private String brand;
 }

blade-service-api/gubersail-dealer-admin-api/src/main/java/com/gubersail/dealer/admin/api/claim/entity/BladeClaim.java

@@ -187,5 +187,17 @@ public class BladeClaim implements Serializable {
 	@ApiModelProperty(value = "轮胎数量")
 	private Integer tireQuantity;
 
+	/**
+	 * 花纹
+	 */
+	@ApiModelProperty(value = "花纹")
+	private String brandItem;
+
+	/**
+	 * 品牌名称
+	 */
+	@ApiModelProperty(value = "品牌名称")
+	private String brandName;
+
 
 }

blade-service-api/gubersail-dealer-app-api/src/main/java/com/gubersail/app/api/claim/entity/AppClaim.java

@@ -188,5 +188,17 @@ public class AppClaim implements Serializable {
 	@ApiModelProperty(value = "轮胎数量")
 	private Integer tireQuantity;
 
+	/**
+	 * 花纹
+	 */
+	@ApiModelProperty(value = "花纹")
+	private String brandItem;
+
+	/**
+	 * 品牌名称
+	 */
+	@ApiModelProperty(value = "品牌名称")
+	private String brandName;
+
 
 }

blade-service-api/gubersail-shop-app-api/src/main/java/com/gubersail/shop/app/api/claim/entity/ShopAppClaim.java

@@ -188,5 +188,17 @@ public class ShopAppClaim implements Serializable {
 	@ApiModelProperty(value = "轮胎数量")
 	private Integer tireQuantity;
 
+	/**
+	 * 花纹
+	 */
+	@ApiModelProperty(value = "花纹")
+	private String brandItem;
+
+	/**
+	 * 品牌名称
+	 */
+	@ApiModelProperty(value = "品牌名称")
+	private String brandName;
+
 
 }

blade-service-api/gubersail-shop-app-api/src/main/java/com/gubersail/shop/app/api/insurance/entity/ShopAppTireInsuranceFiles.java

@@ -131,5 +131,17 @@ public class ShopAppTireInsuranceFiles implements Serializable {
 	@ApiModelProperty(value = "胎号/轮胎宝编号")
 	private String tyreNo;
 
+	/**
+	 * 花纹
+	 */
+	@ApiModelProperty(value = "花纹")
+	private String brandItem;
+
+	/**
+	 * 品牌名称
+	 */
+	@ApiModelProperty(value = "品牌名称")
+	private String brandName;
+
 
 }

blade-service-api/gubersail-shop-app-api/src/main/java/com/gubersail/shop/app/api/insurance/vo/ShopAppTireInsuranceRegisterVO.java

@@ -106,4 +106,14 @@ public class ShopAppTireInsuranceRegisterVO extends ShopAppTireInsuranceRegister
 	 */
 	private String tyreSpecs;
 
+	/**
+	 * 花纹
+	 */
+	private String brandItem;
+
+	/**
+	 * 品牌名称
+	 */
+	private String brandName;
+
 }

blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml

@@ -103,6 +103,20 @@
         FROM blade_user
         where tenant_id = #{param1}
           and is_deleted = 0
+        <if test="deptIdList!=null and deptIdList.size>0">
+            and id in (
+            SELECT
+            user_id
+            FROM
+            blade_user_dept
+            WHERE
+            dept_id IN
+            <foreach collection="deptIdList" index="index" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+            )
+        </if>
+        ORDER BY id
     </select>
     <select id="gainUser" resultType="map">
         SELECT

blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java

@@ -64,13 +64,19 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 	public boolean submit(User user) {
 		if (AuthUtil.getUserRole().contains("dealer")) {
 			user.setDeptId(AuthUtil.getDeptId());
-			user.setUserTypeRole(2);
+			if (ObjectUtils.isNull(user.getUserTypeRole())){
+				user.setUserTypeRole(2);
+			}
 		}
 		if (AuthUtil.getUserRole().contains("store")) {
-			user.setUserTypeRole(3);
+			if (ObjectUtils.isNull(user.getUserTypeRole())){
+				user.setUserTypeRole(3);
+			}
 		}
 		if (AuthUtil.getUserRole().contains("车主")) {
-			user.setUserTypeRole(4);
+			if (ObjectUtils.isNull(user.getUserTypeRole())){
+				user.setUserTypeRole(4);
+			}
 		}
 		if (ObjectUtils.isNotNull(user.getDeptId())) {
 			user.setDeptPid(selectTopId(user.getDeptId()));

blade-service/gubersail-shop-app/src/main/java/com/gubersail/shop/app/insurance/service/impl/ShopAppTireInsuranceRegisterServiceImpl.java

@@ -366,6 +366,8 @@ public class ShopAppTireInsuranceRegisterServiceImpl extends ServiceImpl<ShopApp
 		claim.setClaimReason("");
 		claim.setConsumerName(tireInsuranceRegister.getConsumerName());
 		claim.setConsumerPhone(tireInsuranceRegister.getConsumerPhone());
+		claim.setBrandItem(appTireInsuranceRegister.getBrandItem());
+		claim.setBrandName(appTireInsuranceRegister.getBrandName());
 		// 7. 设置理赔来源信息（区分管理员和普通用户）
 		if (AuthUtil.getUserRole().contains("admin")) {
 			// 管理员直接使用用户信息