|
@@ -26,10 +26,7 @@ import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.data.redis.core.RedisTemplate;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
-import org.springframework.web.bind.annotation.PostMapping;
|
|
|
-import org.springframework.web.bind.annotation.RequestBody;
|
|
|
-import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
-import org.springframework.web.bind.annotation.RestController;
|
|
|
+import org.springframework.web.bind.annotation.*;
|
|
|
import tk.mybatis.mapper.entity.Condition;
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
@@ -65,7 +62,7 @@ public class DepartmentController {
|
|
|
JSONObject tokenJson = JSON.parseObject(redisToken);
|
|
|
if("region".equals(tokenJson.getString("roleKey")) || "regionShoot".equals(tokenJson.getString("roleKey"))){
|
|
|
List<DepartmentEntity> list = new ArrayList<>();
|
|
|
- list.add(departmentService.findById(tokenJson.getString("departmentId")));
|
|
|
+ list.add(departmentService.findById(tokenJson.getString("dep artmentId")));
|
|
|
return Result.success(list);
|
|
|
}
|
|
|
}
|
|
@@ -213,4 +210,6 @@ public class DepartmentController {
|
|
|
|
|
|
return Result.success(departmentService.findAll(condition));
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
}
|