fix：

1、用户同步

app/src/main/java/com/yiring/app/excel/dept/DepartmentImportExcel.java

@@ -27,17 +27,17 @@ public class DepartmentImportExcel implements Serializable {
     @Serial
     private static final long serialVersionUID = -1287875741111587840L;
 
-    @ExcelColumn(index = 0)
+    @ExcelColumn(title = "部门名称")
     @NotNull
     String name;
 
-    @ExcelColumn(index = 1)
+    @ExcelColumn(title = "负责人")
     String realName;
 
-    @ExcelColumn(index = 2)
+    @ExcelColumn(title = "手机号码")
     String mobile;
 
-    @ExcelColumn(index = 3)
+    @ExcelColumn(title = "状态")
     String enable;
 
     public static Department transform(DepartmentImportExcel departmentImportExcel) {

app/src/main/java/com/yiring/app/excel/location/tag/LocationTagImportExcel.java

@@ -26,15 +26,15 @@ public class LocationTagImportExcel implements Serializable {
     private static final long serialVersionUID = -8817732062049005201L;
 
     // 编号
-    @ExcelColumn(index = 0)
+    @ExcelColumn(title = "编号")
     String code;
 
     // 标签型号
-    @ExcelColumn(index = 1)
+    @ExcelColumn(title = "标签型号")
     String type;
 
     // 设备编码
-    @ExcelColumn(index = 2)
+    @ExcelColumn(title = "imei")
     String imei;
 
     public static LocationTag transform(LocationTagImportExcel locationTagImportExcel) {

app/src/main/java/com/yiring/app/excel/user/UserImportExcel.java

@@ -26,39 +26,39 @@ public class UserImportExcel implements Serializable {
     private static final long serialVersionUID = 3471291755743945051L;
 
     // 姓名
-    @ExcelColumn(index = 0)
+    @ExcelColumn(title = "姓名")
     String realName;
 
     // 工号
-    @ExcelColumn(index = 1)
+    @ExcelColumn(title = "工号")
     String uuid;
 
     // 图标类型
-    @ExcelColumn(index = 2)
+    @ExcelColumn(title = "图标类型")
     String type;
 
     // 手机号
-    @ExcelColumn(index = 3)
+    @ExcelColumn(title = "手机号码")
     String mobile;
 
     // 部门id
-    @ExcelColumn(index = 4)
+    @ExcelColumn(title = "部门名称")
     String deptName;
 
     // 职位id
-    @ExcelColumn(index = 5)
+    @ExcelColumn(title = "职位名称")
     String postName;
 
     // 标签号
-    @ExcelColumn(index = 6)
+    @ExcelColumn(title = "标签编号")
     String code;
 
     // 性别
-    @ExcelColumn(index = 7)
+    @ExcelColumn(title = "性别")
     Boolean gender;
 
     // 是否为特殊人员
-    @ExcelColumn(index = 8)
+    @ExcelColumn(title = "特殊人员")
     Boolean isSpecial;
 
     public static User transform(UserImportExcel userImportExcel) {

app/src/main/java/com/yiring/app/param/location/tag/LocationTagTypeFindParam.java

@@ -29,6 +29,6 @@ public class LocationTagTypeFindParam implements Serializable {
     @ApiModelProperty(value = "编号", example = "BTT8888888")
     String code;
 
-    @ApiModelProperty(value = "类别", example = "1:内部/2:访客")
+    @ApiModelProperty(value = "类别", example = "1内部/2访客")
     Integer category;
 }

app/src/main/java/com/yiring/app/param/user/UserAddParam.java

@@ -43,13 +43,13 @@ public class UserAddParam implements Serializable {
     Boolean gender;
 
     @ApiModelProperty(value = "归属部门", example = "1", required = true)
-    String deptId;
+    Long deptId;
 
     @ApiModelProperty(value = "工号", example = "1888888888", required = true)
     String uuid;
 
     @ApiModelProperty(value = "职位", example = "1")
-    String postId;
+    Long postId;
 
     @ApiModelProperty(value = "是否特殊人员", example = "0/1", required = true)
     Boolean isSpecial;

app/src/main/java/com/yiring/app/param/user/UserModifyParam.java

@@ -2,6 +2,7 @@
 package com.yiring.app.param.user;
 
 import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.ObjectUtil;
 import com.yiring.auth.domain.dept.Department;
 import com.yiring.auth.domain.post.Post;
 import com.yiring.auth.domain.user.User;
@@ -55,14 +56,14 @@ public class UserModifyParam implements Serializable {
 
     @ApiModelProperty(value = "归属部门", example = "1", required = true)
     @NotNull
-    String deptId;
+    Long deptId;
 
     @ApiModelProperty(value = "工号", example = "1888888888", required = true)
     @NotNull
     String uuid;
 
     @ApiModelProperty(value = "职位", example = "1")
-    String postId;
+    Long postId;
 
     @ApiModelProperty(value = "是否特殊人员", example = "0/1", required = true)
     @NotNull
@@ -76,6 +77,8 @@ public class UserModifyParam implements Serializable {
         user.setGender(userModifyParam.getGender());
         user.setDepartment(Department.builder().id(Convert.toLong(userModifyParam.getDeptId())).build());
         user.setUuid(userModifyParam.getUuid());
-        user.setPost(Post.builder().id(Convert.toLong(userModifyParam.getPostId())).build());
+        if (ObjectUtil.isNotEmpty(userModifyParam.getPostId())) {
+            user.setPost(Post.builder().id(Convert.toLong(userModifyParam.getPostId())).build());
+        }
     }
 }

app/src/main/java/com/yiring/app/service/location/tag/impl/LocationTagTypeServiceImpl.java

@@ -2,13 +2,19 @@
 package com.yiring.app.service.location.tag.impl;
 
 import cn.hutool.core.collection.ListUtil;
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
 import com.yiring.app.domain.location.LocationTag;
 import com.yiring.app.domain.location.LocationTagRepository;
+import com.yiring.app.feign.zy.location.tag.LocationTagTypeClient;
 import com.yiring.app.param.location.tag.LocationTagTypeFindParam;
 import com.yiring.app.param.location.tag.LocationTagTypeSendParam;
+import com.yiring.app.param.zy.location.tag.ZyLocationTagTypeSendParam;
 import com.yiring.app.service.location.tag.LocationTagTypeService;
+import com.yiring.app.util.zy.ZyUtil;
 import com.yiring.app.vo.location.tag.LocationTagTypeVo;
 import com.yiring.common.core.Result;
 import com.yiring.common.domain.BasicEntity;
@@ -16,6 +22,7 @@ import com.yiring.common.param.PageParam;
 import com.yiring.common.vo.PageVo;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 import javax.annotation.Resource;
 import javax.persistence.criteria.CriteriaBuilder;
@@ -38,9 +45,14 @@ import org.springframework.transaction.annotation.Transactional;
 @Slf4j
 public class LocationTagTypeServiceImpl implements LocationTagTypeService {
 
+    final Integer FACTORY_ID = 100;
+
     @Resource
     LocationTagRepository locationTagRepository;
 
+    @Resource
+    LocationTagTypeClient locationTagTypeClient;
+
     @Override
     public Result<PageVo<LocationTagTypeVo>> findLocationTagType(
         LocationTagTypeFindParam locationTagTypeFindParam,
@@ -75,13 +87,34 @@ public class LocationTagTypeServiceImpl implements LocationTagTypeService {
 
     @Override
     public Result<String> sendLocationTagType(LocationTagTypeSendParam locationtagtypeSendParam) {
+        ZyLocationTagTypeSendParam zyLocationTagTypeSendParam = ZyLocationTagTypeSendParam
+            .builder()
+            .orgId(FACTORY_ID)
+            .category(locationtagtypeSendParam.getCategory())
+            .build();
+
+        String[] split = locationtagtypeSendParam.getIds().split(",");
+        ArrayList<Long> ids = ListUtil.toList();
+        ArrayList<String> list = ListUtil.toList(split);
+        for (String id : list) {
+            Optional<LocationTag> locationTagOptional = locationTagRepository.findById(Convert.toLong(id));
+            locationTagOptional.ifPresent(locationTag -> ids.add(locationTag.getLinkId()));
+        }
+        zyLocationTagTypeSendParam.setIds(Convert.toLongArray(ids));
+
+        JSONObject jsonObject = locationTagTypeClient.updateEntityType(
+            JSONUtil.toJsonStr(zyLocationTagTypeSendParam),
+            ZyUtil.manageLogin()
+        );
+        if (!ObjectUtil.equals(jsonObject.get("code"), 200)) {
+            throw new RuntimeException(StrUtil.toString(jsonObject.get("msg")));
+        }
+
         Specification<LocationTag> specification = (root, cq, cb) -> {
             List<Predicate> predicates = ListUtil.toList();
             if (StrUtil.isNotEmpty(locationtagtypeSendParam.getIds())) {
                 CriteriaBuilder.In<Object> in = cb.in(root.get(BasicEntity.Fields.id));
-                String[] split = locationtagtypeSendParam.getIds().split(",");
-                ArrayList<String> list = ListUtil.toList(split);
-                for (String id : list) in.value(id);
+                for (String id : list) in.value(Convert.toLong(id));
                 predicates.add(cb.and(in));
             }