维修人员坐标更新（缓存处理）

src/main/java/org/springblade/modules/system/controller/UserController.java

@@ -69,6 +69,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE;
 import static org.springblade.core.cache.constant.CacheConstant.USER_CACHE;
 
 /**
@@ -360,4 +361,22 @@ public class UserController {
 		List<User> users = userService.list(Wrappers.lambdaQuery(User.class).eq(User::getRoleId, "1839552581620793346"));
 		return R.data(users);
 	}
+
+	/**
+	 * 维修人员坐标更新
+	 */
+	@PostMapping("/updateCoordinate")
+	public R updateCoordinate(@RequestBody User user) {
+		CacheUtil.put(SYS_CACHE, "coordinate:id:", user.getId(), user.getAddressLon() + "," + user.getAddressLon());
+		return R.status(true);
+	}
+
+	/**
+	 * 获取维修人员坐标
+	 */
+	@GetMapping("/getCoordinate")
+	public R getCoordinate(String userId) {
+		String coordinate = CacheUtil.get(SYS_CACHE, "coordinate:id:", userId, String.class);
+		return R.data(coordinate);
+	}
 }

src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml

@@ -75,7 +75,8 @@
     </select>
 
     <select id="limsTree" resultMap="treeNodeResultMap">
-        select id, parent_id, dept_name as title, id as "value", id as "key" from blade_dept where is_deleted = 0 and dept_category in (5,6,7)
+        select id, parent_id, dept_name as title, id as "value", id as "key" from blade_dept where is_deleted = 0 and dept_category in (5)
+        and id not in (SELECT dept_id FROM lab_maintenance_plan WHERE is_deleted = 0)
         <if test="_parameter!=null and _parameter!=''">
             and tenant_id = #{_parameter}
         </if>

src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java

@@ -185,7 +185,7 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
 
 	@Override
 	public List<DeptVO> limsTree(String tenantId) {
-		return ForestNodeMerger.merge(baseMapper.limsTree(tenantId));
+		return baseMapper.limsTree(tenantId);
 	}
 
 }